summaryrefslogtreecommitdiff
path: root/src/saveload.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-05-29 15:13:28 +0000
committerrubidium <rubidium@openttd.org>2008-05-29 15:13:28 +0000
commit923e21129c94c36bb403e955a1f334ef34722e8b (patch)
tree59059f0a1aba0794fa770e8c9a19312e4ce300af /src/saveload.h
parent2a816fb685b373e38347f809bcdc7f2fdef0139c (diff)
downloadopenttd-923e21129c94c36bb403e955a1f334ef34722e8b.tar.xz
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
Diffstat (limited to 'src/saveload.h')
-rw-r--r--src/saveload.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/saveload.h b/src/saveload.h
index b2f20a548..bed4f7737 100644
--- a/src/saveload.h
+++ b/src/saveload.h
@@ -304,7 +304,7 @@ static inline VarType GetVarFileType(VarType type)
* to add this to the address of the object */
static inline void *GetVariableAddress(const void *object, const SaveLoad *sld)
{
- return (byte*)object + (ptrdiff_t)sld->address;
+ return (byte*)(sld->global ? NULL : object) + (ptrdiff_t)sld->address;
}
int64 ReadValue(const void *ptr, VarType conv);