diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-21 20:15:55 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | 96a47877104d99e117b9fd97e43908f9e9567ec5 (patch) | |
| tree | 2d7bec001304967a69796fd3975024662ffca330 /src/saveload | |
| parent | aa220b2375efecf831ead0794e6de7b621e3c7a2 (diff) | |
| download | openttd-96a47877104d99e117b9fd97e43908f9e9567ec5.tar.xz | |
Codechange: Set ZoomLevel's base type to byte instead of using ZoomLevelByte
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/misc_sl.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/saveload_internal.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 8d9b0ffa6..b5095c521 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2834,7 +2834,7 @@ bool AfterLoadGame() if (IsSavegameVersionBefore(SLV_165)) { /* Adjust zoom level to account for new levels */ - _saved_scrollpos_zoom = _saved_scrollpos_zoom + ZOOM_LVL_SHIFT; + _saved_scrollpos_zoom = static_cast<ZoomLevel>(_saved_scrollpos_zoom + ZOOM_LVL_SHIFT); _saved_scrollpos_x *= ZOOM_LVL_BASE; _saved_scrollpos_y *= ZOOM_LVL_BASE; } diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index f0b130952..4a9b05a46 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -30,7 +30,7 @@ extern byte _trees_tick_ctr; /* Keep track of current game position */ int _saved_scrollpos_x; int _saved_scrollpos_y; -ZoomLevelByte _saved_scrollpos_zoom; +ZoomLevel _saved_scrollpos_zoom; void SaveViewportBeforeSaveGame() { diff --git a/src/saveload/saveload_internal.h b/src/saveload/saveload_internal.h index 74e5b9936..e7a9e7bf5 100644 --- a/src/saveload/saveload_internal.h +++ b/src/saveload/saveload_internal.h @@ -49,7 +49,7 @@ void CopyTempEngineData(); extern int32 _saved_scrollpos_x; extern int32 _saved_scrollpos_y; -extern ZoomLevelByte _saved_scrollpos_zoom; +extern ZoomLevel _saved_scrollpos_zoom; extern SavegameType _savegame_type; extern uint32 _ttdp_version; |