mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use MapLogY() instead of FindFirstBit(MapSizeY()), MapSize() instead of MapSizeX() * MapSizeY()

pull/10397/head
Rubidium 2023-01-21 10:31:31 +01:00 committed by rubidium42
parent 22d3de8b67
commit 9c1a3b17e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/console_cmds.cpp
View File

@ -1144,7 +1144,7 @@ DEF_CONSOLE_CMD(ConRestart)
/* Don't copy the _newgame pointers to the real pointers, so call SwitchToMode directly */ /* Don't copy the _newgame pointers to the real pointers, so call SwitchToMode directly */
_settings_game.game_creation.map_x = MapLogX(); _settings_game.game_creation.map_x = MapLogX();
_settings_game.game_creation.map_y = FindFirstBit(MapSizeY()); _settings_game.game_creation.map_y = MapLogY();
_switch_mode = SM_RESTARTGAME; _switch_mode = SM_RESTARTGAME;
return true; return true;
} }
@ -1161,7 +1161,7 @@ DEF_CONSOLE_CMD(ConReload)
/* Don't copy the _newgame pointers to the real pointers, so call SwitchToMode directly */ /* Don't copy the _newgame pointers to the real pointers, so call SwitchToMode directly */
_settings_game.game_creation.map_x = MapLogX(); _settings_game.game_creation.map_x = MapLogX();
_settings_game.game_creation.map_y = FindFirstBit(MapSizeY()); _settings_game.game_creation.map_y = MapLogY();
_switch_mode = SM_RELOADGAME; _switch_mode = SM_RELOADGAME;
return true; return true;
} }

2
src/landscape.cpp
View File

@ -1536,7 +1536,7 @@ static uint CalculateCoverageLine(uint coverage, uint edge_multiplier)
} }
/* The amount of land we have is the map size minus the first (sea) layer. */ /* The amount of land we have is the map size minus the first (sea) layer. */
uint land_tiles = MapSizeX() * MapSizeY() - histogram[0]; uint land_tiles = MapSize() - histogram[0];
int best_score = land_tiles; int best_score = land_tiles;
/* Our goal is the coverage amount of the land-mass. */ /* Our goal is the coverage amount of the land-mass. */