diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-02-23 20:53:30 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-02-23 20:53:30 +0000 |
| commit | f3b50cdd35b3b276a0a0a6e7416c629f91995919 (patch) | |
| tree | 17eeea5924c72a01259a6978e1fb10a8caa9e503 /saveload.c | |
| parent | 6e4bd06aa18d89bdd4cf2d5c45bf95136bf3c22f (diff) | |
| download | openttd-f3b50cdd35b3b276a0a0a6e7416c629f91995919.tar.xz | |
(svn r3662) Fix regression FS#58 with union, endiannes and static decleration problems. Removed the union.
Diffstat (limited to 'saveload.c')
| -rw-r--r-- | saveload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/saveload.c b/saveload.c index 0eb33e1fd..55d423391 100644 --- a/saveload.c +++ b/saveload.c @@ -580,7 +580,7 @@ size_t SlCalcObjMemberLength(const SaveLoad *sld) case SL_VAR: return SlCalcConvFileLen(sld->conv); case SL_REF: return SlCalcRefLen(); case SL_ARR: return SlCalcArrayLen(sld->length, sld->conv); - case SL_STR: return SlCalcStringLen(sld->s.address, sld->length); + case SL_STR: return SlCalcStringLen(sld->address, sld->length); default: NOT_REACHED(); } break; @@ -655,7 +655,7 @@ void SlObject(void *object, const SaveLoad *sld) } for (; sld->cmd != SL_END; sld++) { - void *ptr = (byte*)object + sld->s.offset; + void *ptr = (byte*)object + (unsigned long)sld->address; SlObjectMember(ptr, sld); } } @@ -672,7 +672,7 @@ void SlGlobList(const SaveLoadGlobVarList *sldg) } for (; sldg->cmd != SL_END; sldg++) { - SlObjectMember(sldg->s.address, (const SaveLoad*)sldg); + SlObjectMember(sldg->address, (const SaveLoad*)sldg); } } |