mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r216) -Fix: paused network game now disallows all commands (instead of doing
the commands all at once when the game unpauses)
This commit is contained in:
parent
9be6a4cea4
commit
53ee4f6540
|
@ -385,6 +385,15 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
|
||||||
|
|
||||||
assert(_docommand_recursive == 0);
|
assert(_docommand_recursive == 0);
|
||||||
|
|
||||||
|
if (_networking && !(cmd & CMD_NET_INSTANT) && _pause) {
|
||||||
|
// When the game is paused, and we are in a network game
|
||||||
|
// we do not allow any commands. This is because
|
||||||
|
// of some technical reasons
|
||||||
|
ShowErrorMessage(-1, STR_MULTIPLAYER_PAUSED, x, y);
|
||||||
|
_docommand_recursive = 0;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
_error_message = INVALID_STRING_ID;
|
_error_message = INVALID_STRING_ID;
|
||||||
_error_message_2 = cmd >> 16;
|
_error_message_2 = cmd >> 16;
|
||||||
_additional_cash_required = 0;
|
_additional_cash_required = 0;
|
||||||
|
|
|
@ -2556,6 +2556,7 @@ STR_B006_FLOOD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Floods!{}At least {COMMA16} p
|
||||||
STR_BRIBE_FAILED :{WHITE}Your attempted bribery has been
|
STR_BRIBE_FAILED :{WHITE}Your attempted bribery has been
|
||||||
STR_BRIBE_FAILED_2 :{WHITE}discovered by a regional investigator
|
STR_BRIBE_FAILED_2 :{WHITE}discovered by a regional investigator
|
||||||
STR_BUILD_DATE :{BLACK}Built: {LTBLUE}{DATE_LONG}
|
STR_BUILD_DATE :{BLACK}Built: {LTBLUE}{DATE_LONG}
|
||||||
|
STR_MULTIPLAYER_PAUSED :{WHITE}Game is paused.{}Command cannot be executed
|
||||||
|
|
||||||
STR_PERFORMANCE_DETAIL :{WHITE}Detail performance rating
|
STR_PERFORMANCE_DETAIL :{WHITE}Detail performance rating
|
||||||
STR_PERFORMANCE_DETAIL_KEY :{BLACK}Detail
|
STR_PERFORMANCE_DETAIL_KEY :{BLACK}Detail
|
||||||
|
|
Loading…
Reference in New Issue