summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2007-02-27 16:05:20 +0000
committerDarkvater <darkvater@openttd.org>2007-02-27 16:05:20 +0000
commit9cbc0e4adea4402426444bcea7fa1fccc3755f86 (patch)
tree636b92a8140ebe2735152c8ff3ce01fcb2830dd8
parent44879ab2c5014b32d6f9434359c63b33960a5d55 (diff)
downloadopenttd-9cbc0e4adea4402426444bcea7fa1fccc3755f86.tar.xz
(svn r8918) -Revert r8914 as the inverted files have been committed not the correct one.
-rw-r--r--src/newgrf_gui.cpp3
-rw-r--r--src/saveload.cpp7
2 files changed, 6 insertions, 4 deletions
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 54cbdd536..6d5a78b89 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -485,9 +485,6 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
break;
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 */
ClearGRFConfigList(WP(w, newgrf_d).list);
break;
diff --git a/src/saveload.cpp b/src/saveload.cpp
index 8e5348bc1..4922419e6 100644
--- a/src/saveload.cpp
+++ b/src/saveload.cpp
@@ -1593,8 +1593,13 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
/* No loader found, treat as version 0 and use LZO format */
if (fmt == endof(_saveload_formats)) {
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);
+#endif
_sl_version = 0;
_sl_minor_version = 0;
fmt = _saveload_formats + 1; // LZO