Merge branch 'master' into jgrpp

Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -73,7 +73,7 @@ extern std::atomic<bool> _exit_game;
 extern bool _save_config;

 /** Modes of pausing we've got */
-enum PauseMode : byte {
+enum PauseMode : uint8_t {
 	PM_UNPAUSED              = 0,      ///< A normal unpaused game
 	PM_PAUSED_NORMAL         = 1 << 0, ///< A game normally paused
 	PM_PAUSED_SAVELOAD       = 1 << 1, ///< A game paused for saving/loading