projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed duplicate variable to check if request dialog is active
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 78adf94b51b76f898abd8b68bc609c8739e7bca0..f7fc34a2cd06ecfd80caa488e711d7d96ce92cbc 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-3063,7
+3063,7
@@
static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,
void DrawEnvelopeRequestToScreen(int drawing_target)
{
if (global.use_envelope_request &&
void DrawEnvelopeRequestToScreen(int drawing_target)
{
if (global.use_envelope_request &&
- game.request_active
_or_moving
&&
+ game.request_active &&
drawing_target == DRAW_TO_SCREEN)
{
if (graphic_info[IMG_BACKGROUND_REQUEST].draw_masked)
drawing_target == DRAW_TO_SCREEN)
{
if (graphic_info[IMG_BACKGROUND_REQUEST].draw_masked)
@@
-4508,8
+4508,6
@@
static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
if (game_just_ended)
game.panel.active = FALSE;
if (game_just_ended)
game.panel.active = FALSE;
- game.request_active = TRUE;
-
setRequestPosition(&sx, &sy, FALSE);
button_status = MB_RELEASED;
setRequestPosition(&sx, &sy, FALSE);
button_status = MB_RELEASED;
@@
-4810,8
+4808,6
@@
static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
SetDrawtoField(draw_buffer_last);
SetDrawtoField(draw_buffer_last);
- game.request_active = FALSE;
-
return result;
}
return result;
}
@@
-5089,7
+5085,7
@@
boolean Request(char *text, unsigned int req_state)
boolean overlay_enabled = GetOverlayEnabled();
boolean result;
boolean overlay_enabled = GetOverlayEnabled();
boolean result;
- game.request_active
_or_moving
= TRUE;
+ game.request_active = TRUE;
SetOverlayEnabled(FALSE);
SetOverlayEnabled(FALSE);
@@
-5100,7
+5096,7
@@
boolean Request(char *text, unsigned int req_state)
SetOverlayEnabled(overlay_enabled);
SetOverlayEnabled(overlay_enabled);
- game.request_active
_or_moving
= FALSE;
+ game.request_active = FALSE;
return result;
}
return result;
}