From: Holger Schemel Date: Thu, 27 Mar 2014 17:58:47 +0000 (+0100) Subject: rnd-20140327-1-src X-Git-Tag: 4.0.0.0-rc1~372 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;ds=sidebyside;h=517ffe169045a7ab7ffe209831fa0bed90759b89;p=rocksndiamonds.git rnd-20140327-1-src --- diff --git a/src/conftime.h b/src/conftime.h index e565798e..77c730dd 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2014-03-15 03:14" +#define COMPILE_DATE_STRING "2014-03-27 15:41" diff --git a/src/tools.c b/src/tools.c index ac20e3c1..aa9beb17 100644 --- a/src/tools.c +++ b/src/tools.c @@ -3334,6 +3334,11 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) #if 1 // game_status = last_game_status; /* restore current game status */ +#if 1 + /* !!! CHECK AGAIN (SEE BELOW) !!! */ + game_status = last_game_status; /* restore current game status */ +#endif + if (action == ACTION_CLOSING) { if (game_status != GAME_MODE_MAIN) @@ -3347,7 +3352,7 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) // SetDrawBackgroundMask(last_draw_background_mask); -#if 1 +#if 0 redraw_mask = REDRAW_FIELD; // redraw_mask |= REDRAW_ALL; #else @@ -3360,8 +3365,10 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) BackToFront(); +#if 0 /* (important: after "BackToFront()", but before "SetDrawtoField()") */ game_status = last_game_status; /* restore current game status */ +#endif #if 1 if (action == ACTION_CLOSING &&