diff options
author | tron <tron@openttd.org> | 2005-12-18 12:10:46 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-12-18 12:10:46 +0000 |
commit | b06b3e2ca2789867580a5227ec346cd69a84eb53 (patch) | |
tree | a0ac2ff6091f2ec7e9b8c392fc45fc93c8b6b85f /command.c | |
parent | 2956b119b26c78df4973cf077e288501baeaf649 (diff) | |
download | openttd-b06b3e2ca2789867580a5227ec346cd69a84eb53.tar.xz |
(svn r3313) Remove GPMI related changes from trunk
Revisions in detail: 2542, 3226 (partial), 3229, 3231, 3232, 3238, 3242-3245, 3251, 3253, 3260, 3263, 3265, 3266, 3269, 3277, 3278, 3279, 3283 (partial), 3304, 3305, 3306
Diffstat (limited to 'command.c')
-rw-r--r-- | command.c | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -10,7 +10,6 @@ #include "player.h" #include "network.h" #include "variables.h" -#include "ai/ai.h" const char* _cmd_text = NULL; @@ -403,8 +402,6 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, int x = TileX(tile) * 16; int y = TileY(tile) * 16; - AI_GetCommandUID(cmd, p1, p2, tile); - /* Do not even think about executing out-of-bounds tile-commands */ if (tile > MapSize()) { _cmd_text = NULL; @@ -477,16 +474,10 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, res = proc(x,y, flags, p1, p2); if (CmdFailed(res)) { if (res & 0xFFFF) _error_message = res & 0xFFFF; - /* Trigger an event special for the AI, so it knows the build has failed - * Because the commands are always delayed, this is the only way. */ - AI_CommandResult(false); goto show_error; } // no money? Only check if notest is off - if (!notest && res != 0 && !CheckPlayerHasMoney(res)) { - AI_CommandResult(false); - goto show_error; - } + if (!notest && res != 0 && !CheckPlayerHasMoney(res)) goto show_error; } #ifdef ENABLE_NETWORK @@ -521,13 +512,10 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, } else { if (CmdFailed(res2)) { if (res2 & 0xFFFF) _error_message = res2 & 0xFFFF; - AI_CommandResult(false); goto show_error; } } - AI_CommandResult(true); - SubtractMoneyFromPlayer(res2); if (IsLocalPlayer() && _game_mode != GM_EDITOR) { |