(svn r10942) -Fix [FS#1133]: make the AI not crash when it has ships as the AI does not support them.
--- a/src/ai/default/default.cpp Sun Aug 19 09:38:30 2007 +0000
+++ b/src/ai/default/default.cpp Sun Aug 19 16:51:15 2007 +0000
@@ -241,14 +241,6 @@
return base;
}
-#if 0
-static EngineID AiChooseShipToBuild(byte cargo, Money money)
-{
- // XXX: not done
- return INVALID_ENGINE;
-}
-#endif
-
static EngineID AiChooseRoadVehToReplaceWith(const Player* p, const Vehicle* v)
{
Money avail_money = p->player_money + v->value;
@@ -279,9 +271,7 @@
static EngineID AiChooseShipToReplaceWith(const Player* p, const Vehicle* v)
{
- error("!AiChooseShipToReplaceWith");
-
- /* maybe useless, but avoids compiler warning this way */
+ /* Ships are not implemented in this (broken) AI */
return INVALID_ENGINE;
}
@@ -402,7 +392,7 @@
static void AiHandleReplaceShip(Player *p)
{
- error("!AiHandleReplaceShip");
+ /* Ships are not implemented in this (broken) AI */
}
typedef EngineID CheckReplaceProc(const Player* p, const Vehicle* v);
@@ -1550,12 +1540,6 @@
}
}
-static void AiWantShipRoute(Player *p)
-{
- // XXX
-// error("AiWaitShipRoute");
-}
-
static void AiStateWantNewRoute(Player *p)
@@ -1589,8 +1573,7 @@
if (_patches.ai_disable_veh_aircraft) continue;
AiWantAircraftRoute(p);
} else {
- if (_patches.ai_disable_veh_ship) continue;
- AiWantShipRoute(p);
+ /* Ships are not implemented in this (broken) AI */
}
// got a route?
@@ -3565,20 +3548,17 @@
static void AiStateCheckShipStuff(Player *p)
{
- // XXX
- error("!AiStateCheckShipStuff");
+ /* Ships are not implemented in this (broken) AI */
}
static void AiStateBuildDefaultShipBlocks(Player *p)
{
- // XXX
- error("!AiStateBuildDefaultShipBlocks");
+ /* Ships are not implemented in this (broken) AI */
}
static void AiStateDoShipStuff(Player *p)
{
- // XXX
- error("!AiStateDoShipStuff");
+ /* Ships are not implemented in this (broken) AI */
}
static void AiStateSellVeh(Player *p)
@@ -3613,9 +3593,8 @@
}
DoCommand(0, v->index, 0, DC_EXEC, CMD_SELL_AIRCRAFT);
- } else if (v->type == VEH_SHIP) {
- // XXX: not implemented
- error("!v->type == VEH_SHIP");
+ } else if (v->type == VEH_SHIP) {
+ /* Ships are not implemented in this (broken) AI */
}
}