rnd-20050101-1-src

* level data now reset to defaults after attempt to load invalid file

diff --git a/ChangeLog b/ChangeLog
index 1364db0c8977ef17be93a9ed2c6d31a95bf1afb1..9a33a4089d692bcf17c24bdeb9e60ef4df40cfc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-12-30
+       * level data now reset to defaults after attempt to load invalid file
+
 2004-11-13
        * added use of "editorsetup.conf" for different level sets
 

diff --git a/src/conftime.h b/src/conftime.h
index 58daaca4c874e14015c7b0e3911afa2f649f4c08..5865410bced7fbafe356da8ef382d4b28a637ecd 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-12-06 03:08]"
+#define COMPILE_DATE_STRING "[2004-12-30 13:53]"

diff --git a/src/files.c b/src/files.c
index abcf15d20761100b5e14479b9a3acc7985349a7f..02f79efba0d11e70715115968b1366d06323acf8 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2501,6 +2501,10 @@ void LoadLevelFromFileInfo(struct LevelInfo *level,
       break;
   }
 
+  /* if level file is invalid, restore level structure to default values */
+  if (level->no_valid_file)
+    setLevelInfoToDefaults(level);
+
   if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN)
     level->game_engine_type = GAME_ENGINE_TYPE_RND;