gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r5263) Use the flag which denotes if it's a plane or helicopter instead of magical engine numbers

Browse Source
This commit is contained in:
tron 2006-06-14 11:26:56 +00:00
parent d2f6cb9e2d
commit 7d2efe3d84
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ai/default/default.c
View File

@ -197,11 +197,7 @@ static EngineID AiChooseAircraftToBuild(int32 money, byte flag)
continue; continue;
} }
if (flag & 1) { if ((AircraftVehInfo(i)->subtype & AIR_CTOL) != flag) continue;
if (i<253) continue;
} else {
if (i>=253) continue;
}
ret = DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_AIRCRAFT); ret = DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_AIRCRAFT);
if (!CmdFailed(ret) && ret <= money && ret >= best_veh_cost) { if (!CmdFailed(ret) && ret <= money && ret >= best_veh_cost) {
@ -246,7 +242,9 @@ static EngineID AiChooseRoadVehToReplaceWith(const Player* p, const Vehicle* v)
static EngineID AiChooseAircraftToReplaceWith(const Player* p, const Vehicle* v) static EngineID AiChooseAircraftToReplaceWith(const Player* p, const Vehicle* v)
{ {
int32 avail_money = p->player_money + v->value; int32 avail_money = p->player_money + v->value;
return AiChooseAircraftToBuild(avail_money, v->engine_type>=253?1:0); return AiChooseAircraftToBuild(
avail_money, AircraftVehInfo(v->engine_type)->subtype & AIR_CTOL
);
} }
static EngineID AiChooseTrainToReplaceWith(const Player* p, const Vehicle* v) static EngineID AiChooseTrainToReplaceWith(const Player* p, const Vehicle* v)
@ -3453,7 +3451,7 @@ static void AiStateBuildAircraftVehicles(Player *p)
tile = TILE_ADD(p->ai.src.use_tile, ToTileIndexDiff(ptr->tileoffs)); tile = TILE_ADD(p->ai.src.use_tile, ToTileIndexDiff(ptr->tileoffs));
veh = AiChooseAircraftToBuild(p->player_money, p->ai.build_kind!=0 ? 1 : 0); veh = AiChooseAircraftToBuild(p->player_money, p->ai.build_kind != 0 ? 0 : AIR_CTOL);
if (veh == INVALID_ENGINE) return; if (veh == INVALID_ENGINE) return;
/* XXX - Have the AI pick the hangar terminal in an airport. Eg get airport-type /* XXX - Have the AI pick the hangar terminal in an airport. Eg get airport-type