dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc_cmd.cpp
View File

@@ -213,7 +213,7 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32_t p1, uint32_t
PauseMode prev_mode = _pause_mode;
if ((p2 & 1) == 0) {
_pause_mode = static_cast<PauseMode>(_pause_mode & (byte)~p1);
_pause_mode = static_cast<PauseMode>(_pause_mode & (uint8_t)~p1);
_pause_countdown = (p2 >> 1);
/* If the only remaining reason to be paused is that we saw a command during pause, unpause. */
@@ -221,7 +221,7 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32_t p1, uint32_t
_pause_mode = PM_UNPAUSED;
}
} else {
_pause_mode = static_cast<PauseMode>(_pause_mode | (byte)p1);
_pause_mode = static_cast<PauseMode>(_pause_mode | (uint8_t)p1);
}
NetworkHandlePauseChange(prev_mode, (PauseMode)p1);