Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-08 01:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21428) -Fix [FS#4021]: vehicles could be built while the game it paused. Now you can enable or disable that with a setting

Browse Source
This commit is contained in:
rubidium 2010-12-07 21:09:30 +00:00
parent 78054d7ad5
commit 434abd6dea
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command.cpp
View File

@ -515,6 +515,11 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallbac
int x = TileX(tile) * TILE_SIZE; int x = TileX(tile) * TILE_SIZE;
int y = TileY(tile) * TILE_SIZE; int y = TileY(tile) * TILE_SIZE;
if (_pause_mode != PM_UNPAUSED && !IsCommandAllowedWhilePaused(cmd)) {
ShowErrorMessage(GB(cmd, 16, 16), STR_ERROR_NOT_ALLOWED_WHILE_PAUSED, WL_INFO, x, y);
return false;
}
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
/* Only set p2 when the command does not come from the network. */ /* Only set p2 when the command does not come from the network. */
if (!(cmd & CMD_NETWORK_COMMAND) && GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = CLIENT_ID_SERVER; if (!(cmd & CMD_NETWORK_COMMAND) && GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = CLIENT_ID_SERVER;

1
src/lang/english.txt
View File

@ -3464,6 +3464,7 @@ STR_ERROR_OWNED_BY :{WHITE}... owne
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company
STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique
STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way
STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}Not allowed while paused
# Local authority errors # Local authority errors
STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this

2
src/openttd.cpp
View File

@ -1365,7 +1365,7 @@ void GameLoop()
if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations(); if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
if (!_pause_mode || _cheats.build_in_pause.value) MoveAllTextEffects(); if (!_pause_mode || _settings_game.construction.command_pause_level > CMDPL_NO_CONSTRUCTION) MoveAllTextEffects();
InputLoop(); InputLoop();

35
src/window.cpp
View File

@ -2213,13 +2213,34 @@ static void MouseLoop(MouseClick click, int mousewheel)
case MC_DOUBLE_LEFT: case MC_DOUBLE_LEFT:
case MC_LEFT: case MC_LEFT:
DEBUG(misc, 2, "Cursor: 0x%X (%d)", _cursor.sprite, _cursor.sprite); DEBUG(misc, 2, "Cursor: 0x%X (%d)", _cursor.sprite, _cursor.sprite);
if (_thd.place_mode != HT_NONE && if (_thd.place_mode != HT_NONE && _pause_mode != PM_UNPAUSED) {
/* query button and place sign button work in pause mode */ switch (_settings_game.construction.command_pause_level) {
_cursor.sprite != SPR_CURSOR_QUERY && case CMDPL_ALL_ACTIONS:
_cursor.sprite != SPR_CURSOR_SIGN && /* We allow all actions. */
_pause_mode != PM_UNPAUSED && break;
!_cheats.build_in_pause.value) {
return; case CMDPL_NO_LANDSCAPING:
if (_cursor.sprite == SPR_CURSOR_CLONE_TRAIN ||
_cursor.sprite == SPR_CURSOR_CLONE_ROADVEH ||
_cursor.sprite == SPR_CURSOR_CLONE_SHIP ||
_cursor.sprite == SPR_CURSOR_CLONE_AIRPLANE) {
/* Cloning is allowed. */
break;
}
/* FALL THROUGH */
case CMDPL_NO_CONSTRUCTION:
if (_cursor.sprite == SPR_CURSOR_SIGN ||
(_cursor.sprite >= SPR_CURSOR_PICKSTATION_FIRST && _cursor.sprite <= SPR_CURSOR_PICKSTATION_LAST)) {
/* Building signs or making orders is allowed. */
break;
}
/* FALL THROUGH */
case CMDPL_NO_ACTIONS:
if (_cursor.sprite == SPR_CURSOR_QUERY) break;
/* All other ones are not allowed to build. */
return;
}
} }
if (!HandleViewportClicked(vp, x, y) && if (!HandleViewportClicked(vp, x, y) &&