summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2019-04-22 09:10:04 +0100
committerPeterN <peter@fuzzle.org>2019-04-29 17:40:22 +0100
commit5b34c8019f135afd9f20d043a489ab96f286038a (patch)
tree84b38701d78f2348ad1e54c5cb379fc15bdcfe67 /src/saveload
parentfcf06ba4c43bb9b7ac0b8541377a5240b3e01126 (diff)
downloadopenttd-5b34c8019f135afd9f20d043a489ab96f286038a.tar.xz
Codechange: Remove Company/OwnerByte types
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/afterload.cpp2
-rw-r--r--src/saveload/waypoint_sl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 5e7521d26..9bdfa6b34 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -1835,7 +1835,7 @@ bool AfterLoadGame()
if (IsBuoyTile(t) || IsDriveThroughStopTile(t) || IsTileType(t, MP_WATER)) {
Owner o = GetTileOwner(t);
if (o < MAX_COMPANIES && !Company::IsValidID(o)) {
- Backup<CompanyByte> cur_company(_current_company, o, FILE_LINE);
+ Backup<CompanyID> cur_company(_current_company, o, FILE_LINE);
ChangeTileOwner(t, o, INVALID_OWNER);
cur_company.Restore();
}
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 66ef145fc..70a1a2739 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -36,7 +36,7 @@ struct OldWaypoint {
uint8 localidx;
uint32 grfid;
const StationSpec *spec;
- OwnerByte owner;
+ Owner owner;
size_t new_index;
};