mirror of https://github.com/OpenTTD/OpenTTD
(svn r12335) -Codechange: Don't stuff signed values into a unsigned variable when the variable can just be unsigned...
parent
e1cc80b01c
commit
3907ac518b
|
@ -37,7 +37,7 @@ bool _screen_disable_anim = false; ///< Disable palette animation (important f
|
||||||
bool _exit_game;
|
bool _exit_game;
|
||||||
bool _networking; ///< are we in networking mode?
|
bool _networking; ///< are we in networking mode?
|
||||||
byte _game_mode;
|
byte _game_mode;
|
||||||
byte _pause_game;
|
int8 _pause_game;
|
||||||
int _pal_first_dirty;
|
int _pal_first_dirty;
|
||||||
int _pal_count_dirty;
|
int _pal_count_dirty;
|
||||||
|
|
||||||
|
|
|
@ -314,11 +314,11 @@ CommandCost CmdPause(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||||
_pause_game += (p1 == 0) ? -1 : 1;
|
_pause_game += (p1 == 0) ? -1 : 1;
|
||||||
|
|
||||||
switch (_pause_game) {
|
switch (_pause_game) {
|
||||||
case (byte)-4:
|
case -4:
|
||||||
case (byte)-1:
|
case -1:
|
||||||
_pause_game = 0;
|
_pause_game = 0;
|
||||||
break;
|
break;
|
||||||
case (byte)-3:
|
case -3:
|
||||||
ShowQuery(
|
ShowQuery(
|
||||||
STR_NEWGRF_UNPAUSE_WARNING_TITLE,
|
STR_NEWGRF_UNPAUSE_WARNING_TITLE,
|
||||||
STR_NEWGRF_UNPAUSE_WARNING,
|
STR_NEWGRF_UNPAUSE_WARNING,
|
||||||
|
|
|
@ -1399,7 +1399,7 @@ bool AfterLoadGame()
|
||||||
|
|
||||||
switch (gcf_res) {
|
switch (gcf_res) {
|
||||||
case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break;
|
case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break;
|
||||||
case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = (byte)-1; break;
|
case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = -1; break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -156,6 +156,6 @@ void OTTD_SendThreadMessage(ThreadMsg msg);
|
||||||
|
|
||||||
extern byte _game_mode;
|
extern byte _game_mode;
|
||||||
extern bool _exit_game;
|
extern bool _exit_game;
|
||||||
extern byte _pause_game;
|
extern int8 _pause_game;
|
||||||
|
|
||||||
#endif /* OPENTTD_H */
|
#endif /* OPENTTD_H */
|
||||||
|
|
Loading…
Reference in New Issue