diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:59 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | 63ccb36ef3ecd53a503c0e9fea87f0784802af0f (patch) | |
| tree | d3e1134029fd437d1ad2d948f83592b930e9456f /src/saveload/saveload.cpp | |
| parent | 9b6f5e3bb850b6cff02cc761767fcdf49c681645 (diff) | |
| download | openttd-63ccb36ef3ecd53a503c0e9fea87f0784802af0f.tar.xz | |
Codechange: Use std::string for most of the user-settable custom names.
Diffstat (limited to 'src/saveload/saveload.cpp')
| -rw-r--r-- | src/saveload/saveload.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 7a41f4c40..4da89aa84 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -793,7 +793,7 @@ void WriteValue(void *ptr, VarType conv, int64 val) case SLE_VAR_U32: *(uint32*)ptr = val; break; case SLE_VAR_I64: *(int64 *)ptr = val; break; case SLE_VAR_U64: *(uint64*)ptr = val; break; - case SLE_VAR_NAME: *(char**)ptr = CopyFromOldName(val); break; + case SLE_VAR_NAME: *reinterpret_cast<std::string *>(ptr) = CopyFromOldName(val); break; case SLE_VAR_NULL: break; default: NOT_REACHED(); } @@ -1515,6 +1515,8 @@ static bool IsVariableSizeRight(const SaveLoad *sld) case SLE_VAR_I64: case SLE_VAR_U64: return sld->size == sizeof(int64); + case SLE_VAR_NAME: + return sld->size == sizeof(std::string); default: return sld->size == sizeof(void *); } |