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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/genworld_gui.cpp
View File

@@ -368,7 +368,7 @@ static void LandscapeGenerationCallback(Window *w, bool confirmed)
*/
static bool CheckMapSize(bool print_warning = true)
{
uint64 tiles = 1ULL << (_settings_newgame.game_creation.map_x + _settings_newgame.game_creation.map_y);
uint64_t tiles = 1ULL << (_settings_newgame.game_creation.map_x + _settings_newgame.game_creation.map_y);
if (_settings_newgame.game_creation.map_x + _settings_newgame.game_creation.map_y > MAX_MAP_TILES_BITS) {
if (print_warning) {
@@ -929,7 +929,7 @@ struct GenerateLandscapeWindow : public Window {
break;
case WID_GL_WATER_PULLDOWN: { // Water quantity
uint32 hidden_mask = 0;
uint32_t hidden_mask = 0;
/* Disable custom water level when the original map generator is active. */
if (_settings_newgame.game_creation.land_generator == LG_ORIGINAL) {
SetBit(hidden_mask, CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY);
@@ -1072,7 +1072,7 @@ struct GenerateLandscapeWindow : public Window {
/* Was 'cancel' pressed? */
if (str == nullptr) return;
int32 value;
int32_t value;
if (!StrEmpty(str)) {
value = atoi(str);
} else {
@@ -1207,7 +1207,7 @@ void StartScenarioEditor()
* Start a normal game without the GUI.
* @param seed The seed of the new game.
*/
void StartNewGameWithoutGUI(uint32 seed)
void StartNewGameWithoutGUI(uint32_t seed)
{
/* GenerateWorld takes care of the possible GENERATE_NEW_SEED value in 'seed' */
_settings_newgame.game_creation.generation_seed = seed;
@@ -1389,7 +1389,7 @@ struct CreateScenarioWindow : public Window
void OnQueryTextFinished(char *str) override
{
if (!StrEmpty(str)) {
int32 value = atoi(str);
int32_t value = atoi(str);
switch (this->widget_id) {
case WID_CS_START_DATE_TEXT: