openttd-mini: comparison ai

equal deleted inserted replaced

-:2d7148a0479f
+:659ca3025cc5
 // Build HQ
 //  Params:
 //    tile : tile where HQ is going to be build
 bool AiNew_Build_CompanyHQ(Player *p, uint tile) {
-	if (DoCommandByTile(tile, 0, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ) == CMD_ERROR)
+	if (CmdFailed(DoCommandByTile(tile, 0, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ)))
 		return false;
 	DoCommandByTile(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ);
 	return true;
 }
 //    direction : the direction of the station
 //    flag : flag passed to DoCommand (normally 0 to get the cost or DC_EXEC to build it)
 int AiNew_Build_Station(Player *p, byte type, uint tile, byte length, byte numtracks, byte direction, byte flag) {
 	if (type == AI_TRAIN)
 		return DoCommandByTile(tile, direction + (numtracks << 8) + (length << 16), 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_RAILROAD_STATION);
-	else if (type == AI_BUS)
+	if (type == AI_BUS)
 		return DoCommandByTile(tile, direction, RS_BUS, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
-	else
-		return DoCommandByTile(tile, direction, RS_TRUCK, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
+	return DoCommandByTile(tile, direction, RS_TRUCK, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
 }
 // Builds a brdige. The second best out of the ones available for this player
 //  Params:
 //   tile_a : starting point
 	if (type2 == 0 && type != 0) type2 = type;
 	// Now, simply, build the bridge!
 	if (p->ainew.tbt == AI_TRAIN)
 		return DoCommandByTile(tile_a, tile_b, (0<<8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
-	else
-		return DoCommandByTile(tile_a, tile_b, (0x80 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
+	return DoCommandByTile(tile_a, tile_b, (0x80 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
 }
 // Build the route part by part
 // Basicly what this function do, is build that amount of parts of the route
 		// Tunnel code
 	if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
 		cost += DoCommandByTile(route[part], 0, 0, flag, CMD_BUILD_TUNNEL);
 		PathFinderInfo->position++;
 		// TODO: problems!
-		if (cost == CMD_ERROR) {
+		if (CmdFailed(cost)) {
 			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be build!");
 				return 0;
 		}
 		return cost;
 	}
 	// Bridge code
 	if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
 		cost += AiNew_Build_Bridge(p, route[part], route[part-1], flag);
 		PathFinderInfo->position++;
 		// TODO: problems!
-		if (cost == CMD_ERROR) {
+		if (CmdFailed(cost)) {
 			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be build!");
 				return 0;
 		}
 		return cost;
 	}
 	     		// Is it the same as the last one?
 	     		if (old_dir != -1 && old_dir != dir) break;
 	     		old_dir = dir;
 	     		// Build the tile
 	     		res = DoCommandByTile(route[part], 0, dir, flag, CMD_BUILD_SINGLE_RAIL);
-	     		if (res == CMD_ERROR) {
+	     		if (CmdFailed(res)) {
 	     			// Problem.. let's just abort it all!
 	     			p->ainew.state = AI_STATE_NOTHING;
 	     			return 0;
 	     		}
 	     		cost += res;
 		// Tunnel code
 	if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
 		cost += DoCommandByTile(route[part], 0x200, 0, flag, CMD_BUILD_TUNNEL);
 		PathFinderInfo->position++;
 		// TODO: problems!
-		if (cost == CMD_ERROR) {
+		if (CmdFailed(cost)) {
 			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be build!");
 				return 0;
 		}
 		return cost;
 	}
 	// Bridge code
 	if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
 		cost += AiNew_Build_Bridge(p, route[part], route[part+1], flag);
 		PathFinderInfo->position++;
 		// TODO: problems!
-		if (cost == CMD_ERROR) {
+		if (CmdFailed(cost)) {
 			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be build!");
 				return 0;
 		}
 		return cost;
 	}
 	     		// There is already some road, and it is a bridge.. don't build!!!
 	     		if (!IsTileType(route[part], MP_TUNNELBRIDGE)) {
 	     			// Build the tile
 	     			res = DoCommandByTile(route[part], dir, 0, flag | DC_NO_WATER, CMD_BUILD_ROAD);
 	     			// Currently, we ignore CMD_ERRORs!
-	     			if (res == CMD_ERROR && flag == DC_EXEC && !IsTileType(route[part], MP_STREET) && !EnsureNoVehicle(route[part])) {
+						if (CmdFailed(res) && flag == DC_EXEC && !IsTileType(route[part], MP_STREET) && !EnsureNoVehicle(route[part])) {
-					// Problem.. let's just abort it all!
+							// Problem.. let's just abort it all!
-					DEBUG(ai,0)("Darn, the route could not be builded.. aborting!");
+							DEBUG(ai,0)("Darn, the route could not be builded.. aborting!");
-	     			p->ainew.state = AI_STATE_NOTHING;
+							p->ainew.state = AI_STATE_NOTHING;
-	     			return 0;
+							return 0;
-	     		} else {
+						}
-	     			if (res != CMD_ERROR)
-	     				cost += res;
+	     	if (!CmdFailed(res)) cost += res;
-	     		}
 		     	}
 	     		// Go to the next tile
 	     		part++;
 	     		// Check if it is still in range..
 	     		if (part >= PathFinderInfo->route_length - 1) break;
 int AiNew_PickVehicle(Player *p) {
 if (p->ainew.tbt == AI_TRAIN) {
 // Not supported yet
 return -1;
 } else {
-int start, count, i, r = CMD_ERROR;
+int start, count, i, ret = CMD_ERROR;
 start = _cargoc.ai_roadveh_start[p->ainew.cargo];
 count = _cargoc.ai_roadveh_count[p->ainew.cargo];
 // Let's check it backwards.. we simply want to best engine available..
 for (i=start+count-1;i>=start;i--) {
 	// Is it availiable?
 	// Also, check if the reliability of the vehicle is above the AI_VEHICLE_MIN_RELIABILTY
 	if (!HASBIT(_engines[i].player_avail, _current_player) || _engines[i].reliability * 100 < AI_VEHICLE_MIN_RELIABILTY << 16) continue;
 	// Can we build it?
-	r = DoCommandByTile(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
+	ret = DoCommandByTile(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
-	if (r != CMD_ERROR) break;
+	if (!CmdFailed(ret)) break;
 	}
 	// We did not find a vehicle :(
-	if (r == CMD_ERROR) { return -1; }
+	if (CmdFailed(ret)) { return -1; }
 	return i;
 }
 }
 // Builds the best vehicle possible
 int AiNew_Build_Vehicle(Player *p, uint tile, byte flag) {
 	int i = AiNew_PickVehicle(p);
 	if (i == -1) return CMD_ERROR;
-	if (p->ainew.tbt == AI_TRAIN) {
+	if (p->ainew.tbt == AI_TRAIN)
 		return CMD_ERROR;
-	} else {
-		return DoCommandByTile(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
+	return DoCommandByTile(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
-	}
+}
-}
+int AiNew_Build_Depot(Player *p, uint tile, byte direction, byte flag)
-int AiNew_Build_Depot(Player *p, uint tile, byte direction, byte flag) {
+{
 	static const byte _roadbits_by_dir[4] = {2,1,8,4};
-	int r, r2;
+	int ret, ret2;
-if (p->ainew.tbt == AI_TRAIN) {
+if (p->ainew.tbt == AI_TRAIN)
 	return DoCommandByTile(tile, 0, direction, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_TRAIN_DEPOT);
-} else {
-	r = DoCommandByTile(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_DEPOT);
+		ret = DoCommandByTile(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_DEPOT);
-	if (r == CMD_ERROR) return r;
+		if (CmdFailed(ret)) return ret;
-	// Try to build the road from the depot
+		// Try to build the road from the depot
-	r2 = DoCommandByTile(tile + TileOffsByDir(direction), _roadbits_by_dir[direction], 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
+		ret2 = DoCommandByTile(tile + TileOffsByDir(direction), _roadbits_by_dir[direction], 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
-	// If it fails, ignore it..
+		// If it fails, ignore it..
-	if (r2 == CMD_ERROR) return r;
+		if (CmdFailed(ret2)) return ret;
-	return r + r2;
+		return ret + ret2;
 }
-}

changeset 1713	659ca3025cc5
parent 1299	39c06aba09aa
child 1891	862800791170