mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8918) -Revert r8914 as the inverted files have been committed not the correct one.

release/0.6
Darkvater 2007-02-27 16:05:20 +00:00
parent 44879ab2c5
commit 9cbc0e4ade
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_gui.cpp
View File

@ -485,9 +485,6 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
break; break;
case WE_DESTROY: case WE_DESTROY:
if (!WP(w, newgrf_d).execute) {
CopyGRFConfigList(WP(w, newgrf_d).orig_list, *WP(w, newgrf_d).list);
}
/* Remove the temporary copy of grf-list used in window */ /* Remove the temporary copy of grf-list used in window */
ClearGRFConfigList(WP(w, newgrf_d).list); ClearGRFConfigList(WP(w, newgrf_d).list);
break; break;

7
src/saveload.cpp
View File

@ -1593,8 +1593,13 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
/* No loader found, treat as version 0 and use LZO format */ /* No loader found, treat as version 0 and use LZO format */
if (fmt == endof(_saveload_formats)) { if (fmt == endof(_saveload_formats)) {
DEBUG(sl, 0, "Unknown savegame type, trying to load it as the buggy format"); DEBUG(sl, 0, "Unknown savegame type, trying to load it as the buggy format");
#if defined(WINCE)
/* Of course some system had not to support rewind ;) */
fseek(_sl.fh, 0L, SEEK_SET);
clearerr(_sl.fh);
#else
rewind(_sl.fh); rewind(_sl.fh);
#endif
_sl_version = 0; _sl_version = 0;
_sl_minor_version = 0; _sl_minor_version = 0;
fmt = _saveload_formats + 1; // LZO fmt = _saveload_formats + 1; // LZO