rnd-20060810-1-src

* fixed small bug with time displayed incorrectly when collecting CEs

diff --git a/ChangeLog b/ChangeLog
index 2df768e45a079934cfa3cab3e3418a0a84cdacc2..6c7adba79b980fae75a80310e2a3b8b6b8580b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-10
+       * fixed small bug with time displayed incorrectly when collecting CEs
+
 2006-08-07
        * fixed bug with bumpy scrolling with EM engine in double player mode
 

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 81901e69895e8f957c66f6141b81a228283cd834..cc9c13669f812236f66109dca702b462de0107b4 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4548,6 +4548,9 @@ struct ConfigInfo image_config[] =
   { "door_2.anim_mode",                                "default"               },
 
 #if DEBUG
+  { "preview.x",                               "-1"                    },
+  { "preview.y",                               "-1"                    },
+
   { "game.level.x",                            "-1"                    },
   { "game.level.y",                            "-1"                    },
   { "game.gems.x",                             "-1"                    },

diff --git a/src/conftime.h b/src/conftime.h
index 60eec91895420a4e88cffcdade44bfdd219b3784..51e949f68b214801af801a9ab9e6de38e02f2cd1 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-08-08 00:01]"
+#define COMPILE_DATE_STRING "[2006-08-10 08:17]"

diff --git a/src/game.c b/src/game.c
index daa0b30eb457c97ec29bd0aa69755f40964e19fd..97b4be7f06e173f958b664b58a26b1206ea22746 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1366,6 +1366,7 @@ void DrawAllGameValues(int emeralds, int dynamite, int score, int time,
 
 void DrawGameDoorValues()
 {
+  int time_value = (level.time == 0 ? TimePlayed : TimeLeft);
   int dynamite_state = 0;
   int key_bits = 0;
   int i, j;
@@ -1414,7 +1415,7 @@ void DrawGameDoorValues()
   }
 
   DrawAllGameValues(local_player->gems_still_needed, dynamite_state,
-                   local_player->score, TimeLeft, key_bits);
+                   local_player->score, time_value, key_bits);
 #endif
 }