summaryrefslogtreecommitdiff
path: root/src/saveload/saveload.cpp
diff options
context:
space:
mode:
authorPeter Nelson <peter1138@openttd.org>2019-01-29 00:09:25 +0000
committerPeterN <peter@fuzzle.org>2019-01-30 17:11:40 +0000
commit67633606b00f87dd11d7cc2ad186624fed38271f (patch)
treeadd0ace08df86c4144f4072f139e240e52582872 /src/saveload/saveload.cpp
parente982b9131e9c92d70dd5994910c1eb8ca644f2f2 (diff)
downloadopenttd-67633606b00f87dd11d7cc2ad186624fed38271f.tar.xz
Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE.
The original translation functionality hasn't been used since 2007.
Diffstat (limited to 'src/saveload/saveload.cpp')
-rw-r--r--src/saveload/saveload.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 29adb40c9..348ba93ba 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -1710,17 +1710,15 @@ bool SlObjectMember(void *ptr, const SaveLoad *sld)
}
break;
- /* SL_WRITEBYTE translates a value of a variable to another one upon
- * saving or loading.
- * XXX - variable renaming abuse
- * game_value: the value of the variable ingame is abused by sld->version_from
- * file_value: the value of the variable in the savegame is abused by sld->version_to */
+ /* SL_WRITEBYTE writes a value to the savegame to identify the type of an object.
+ * When loading, the value is read explictly with SlReadByte() to determine which
+ * object description to use. */
case SL_WRITEBYTE:
switch (_sl.action) {
- case SLA_SAVE: SlWriteByte(sld->version_to); break;
+ case SLA_SAVE: SlWriteByte(*(uint8 *)ptr); break;
case SLA_LOAD_CHECK:
- case SLA_LOAD: *(byte *)ptr = sld->version_from; break;
- case SLA_PTRS: break;
+ case SLA_LOAD:
+ case SLA_PTRS:
case SLA_NULL: break;
default: NOT_REACHED();
}