rnd-20020610-2-src

diff --git a/CHANGES b/CHANGES
index 1e79605f975be121195df4f06cc47ae0175393d1..506f6ea90d6e68b3a59b5807bb65763a766947bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,19 +1,21 @@
 Release Version 2.1.0 [XX XXX XXXX]
 -----------------------------------
-       - fixed memory leak in image loading code
-       - added Boulderdash style "snap-pushing" (thanks to Achim Härtel)
-       - bug fixed that prevented walking through tubes when gravity on
-       - enhanced sound system (especially regarding stereo and loop sounds)
-       - new structured setup menu (with sob-menues for graphics and sounds)
        - graphics, sounds and music now fully configurable
        - added support for TrueColor PCX graphics files
        - added support for 16 bit WAV sound files
+       - enhanced sound system (especially regarding stereo and loop sounds)
+       - new structured setup menu (with sub-menues for graphics and sounds)
        - added "quick save" and "quick load" functions with shortcut key
        - added single-step playing mode (automatic pause after each step)
+       - behaviour of "Escape" key in level editor now more intuitive
        - changed default slipping behaviour of gems back to 2.0.0 style;
          this is now an element property for gems in the level editor,
          although existing converted levels use the new EM gems behaviour
-       - behaviour of "Escape" key in level editor now more intuitive
+       - bug fixed that prevented walking through tubes when gravity on
+       - added Boulderdash style "snap-pushing" (thanks to Achim Härtel)
+       - fixed memory leak in image loading code
+       - fixed some "solid" elements that were accidentally destructible
+       - fixed some tape stuff
 
 Release Version 2.0.1 [19 MAR 2002]
 -----------------------------------

diff --git a/src/editor.c b/src/editor.c
index ac9a5d847b736ba871dbbdd565a38690243aa117..3ab7a71ccf9a770eb86e07f57379d212eaa1d512 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -3641,6 +3641,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
     case ED_COUNTER_ID_SELECT_LEVEL:
       LoadLevel(level_nr);
+      TapeErase();
       ResetUndoBuffer();
       DrawEditModeWindow();
       break;

diff --git a/src/files.c b/src/files.c
index 76fd384a247ed9ad584f713221895da0f609a018..65ab618dfaf5c0f46e658810fe8e72f115c4dc61 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1067,7 +1067,7 @@ void DumpTape(struct TapeInfo *tape)
 
   printf("\n");
   printf("-------------------------------------------------------------------------------\n");
-  printf("Tape of Level %d (file version %06d, game version %06d\n",
+  printf("Tape of Level %d (file version %06d, game version %06d)\n",
         tape->level_nr, tape->file_version, tape->game_version);
   printf("-------------------------------------------------------------------------------\n");
 

diff --git a/src/game.c b/src/game.c
index a6f6ce263b7f3ebad84e30191cafa9951d16fd18..f6956bc428fc091c9f73be2aa2e79ed503b29b8d 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -606,8 +606,9 @@ static void InitGameEngine()
 
 #if 0
     printf("level %d: level version == %06d\n", level_nr, level.game_version);
-    printf("          tape version == %06d [%s]\n",
-          tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"));
+    printf("          tape version == %06d [%s] [file: %06d]\n",
+          tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"),
+          tape.file_version);
     printf("       => game.engine_version == %06d\n", game.engine_version);
 #endif
 

diff --git a/src/init.c b/src/init.c
index 25372817c65617fc2fa08f9cd8ed2fa11467a208..f89f107d8eefb2b59b8081af3bf195dafd3cb2db 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -532,9 +532,13 @@ void InitElementProperties()
     EL_EM_GATE_3X,
     EL_EM_GATE_4X,
     EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
     EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -573,11 +577,15 @@ void InitElementProperties()
     EL_QUICKSAND_EMPTYING,
     EL_MAGIC_WALL_OFF,
     EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL_EMPTYING,
+    EL_MAGIC_WALL_FILLING,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_DEAD,
     EL_MAGIC_WALL_BD_OFF,
     EL_MAGIC_WALL_BD_EMPTY,
+    EL_MAGIC_WALL_BD_EMPTYING,
     EL_MAGIC_WALL_BD_FULL,
+    EL_MAGIC_WALL_BD_FILLING,
     EL_MAGIC_WALL_BD_DEAD,
     EL_LIFE,
     EL_LIFE_ASYNC,
@@ -603,6 +611,7 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT,
     EL_INVISIBLE_STEEL,
     EL_BELT1_SWITCH_LEFT,
@@ -651,6 +660,30 @@ void InitElementProperties()
     EL_CRYSTAL,
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
+    EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
+    EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -674,26 +707,6 @@ void InitElementProperties()
     EL_BADEWANNE3,
     EL_BADEWANNE4,
     EL_BADEWANNE5,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
-    EL_SWITCHGATE_OPEN,
-    EL_SWITCHGATE_CLOSED,
-    EL_TIMEGATE_OPEN,
-    EL_TIMEGATE_CLOSED,
     EL_SP_HARD_GRAY,
     EL_SP_HARD_GREEN,
     EL_SP_HARD_BLUE,
@@ -738,6 +751,30 @@ void InitElementProperties()
     EL_EMC_STEEL_WALL_3,
     EL_EMC_STEEL_WALL_4,
     EL_CRYSTAL,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
+    EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
+    EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -851,6 +888,7 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT,
     EL_INVISIBLE_STEEL,
     EL_STEEL_SLANTED,

diff --git a/src/timestamp.h b/src/timestamp.h
index e1c332bf2ee02ced504e7cf89b92416dd6d861a6..76ab4cc97aa33b42b1eec66aa2f4a1ce682ccda8 100644 (file)
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-06-10 00:51]"
+#define COMPILE_DATE_STRING "[2002-06-10 01:52]"