mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-26 20:32:07 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix open ride error messages

Browse source 
Some error messages aren't properly displayed because 'gGameCommandErrorText' is replaced with 'STR_NONE' before it's displayed.

This only happens with commands that use multiple commands inside them for do another "job" (or do another check).
This commit is contained in:
Josue Acevedo 2016-07-14 14:00:16 -05:00 • committed by Ted John
parent 6fc36cbabb
commit 097c5b101d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game.c
View file

@ -455,7 +455,6 @@ int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int *
}
flags = *ebx;
gGameCommandErrorText = STR_NONE;
if (gGameCommandNestLevel == 0) {
gGameCommandIsNetworked = (flags & GAME_COMMAND_FLAG_NETWORKED) != 0;
@ -570,6 +569,7 @@ int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int *
if (gGameCommandNestLevel == 0 && (flags & GAME_COMMAND_FLAG_APPLY) && RCT2_GLOBAL(0x0141F568, uint8) == RCT2_GLOBAL(0x013CA740, uint8) && !(flags & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED) && !(flags & GAME_COMMAND_FLAG_NETWORKED))
window_error_open(gGameCommandErrorTitle, gGameCommandErrorText);
gGameCommandErrorText = STR_NONE;
return MONEY32_UNDEFINED;
}