diff options
| author | glx <glx@openttd.org> | 2006-06-11 21:38:35 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2006-06-11 21:38:35 +0000 |
| commit | 84f553b47f357205b64d1ee12c743ee0b3e5c7db (patch) | |
| tree | dc696a437b164b3d44051f99565c5085903ac156 | |
| parent | 8316020ff3016b002a8852b34ac8e94582602d18 (diff) | |
| download | openttd-84f553b47f357205b64d1ee12c743ee0b3e5c7db.tar.xz | |
(svn r5229) Remove a write-only variable
| -rw-r--r-- | saveload.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/saveload.c b/saveload.c index 4f6854a96..6a75d7955 100644 --- a/saveload.c +++ b/saveload.c @@ -1464,7 +1464,6 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode) { uint32 hdr[2]; const SaveLoadFormat *fmt; - uint version; /* An instance of saving is already active, so don't go saving again */ if (_ts.saveinprogress && mode == SL_SAVE) { @@ -1515,10 +1514,6 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode) return SL_ERROR; } - /* We first initialize here to avoid: "warning: variable `version' might - * be clobbered by `longjmp' or `vfork'" */ - version = 0; - /* General tactic is to first save the game to memory, then use an available writer * to write it to file, either in threaded mode if possible, or single-threaded */ if (mode == SL_SAVE) { /* SAVE game */ @@ -1557,7 +1552,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode) if (fmt == endof(_saveload_formats)) { DEBUG(misc, 0) ("[Sl] Unknown savegame type, trying to load it as the buggy format."); rewind(_sl.fh); - _sl_version = version = 0; + _sl_version = 0; _sl_minor_version = 0; fmt = _saveload_formats + 1; // LZO break; @@ -1565,7 +1560,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode) if (fmt->tag == hdr[0]) { // check version number - _sl_version = version = TO_BE32(hdr[1]) >> 16; + _sl_version = TO_BE32(hdr[1]) >> 16; /* Minor is not used anymore from version 18.0, but it is still needed * in versions before that (4 cases) which can't be removed easy. * Therefor it is loaded, but never saved (or, it saves a 0 in any scenario). |