From: Holger Schemel Date: Thu, 10 Aug 2006 07:35:03 +0000 (+0200) Subject: rnd-20060810-1-src X-Git-Tag: 3.2.1^2~17 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=55ea36f783098df4472f62634644131a8058e39b;p=rocksndiamonds.git rnd-20060810-1-src * fixed small bug with time displayed incorrectly when collecting CEs --- diff --git a/ChangeLog b/ChangeLog index 2df768e4..6c7adba7 100644 --- 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 81901e69..cc9c1366 100644 --- 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 60eec918..51e949f6 100644 --- 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 daa0b30e..97b4be7f 100644 --- 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 }