projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b969bb
)
minor code cleanup
author
Holger Schemel
<info@artsoft.org>
Sun, 3 Dec 2023 17:38:25 +0000
(18:38 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sun, 3 Dec 2023 17:46:20 +0000
(18:46 +0100)
src/tools.c
patch
|
blob
|
history
diff --git
a/src/tools.c
b/src/tools.c
index c1b367a600776bad7a9a9bd163ef8de58e6d74fb..26532a75425c1453c8f5ee41de15f4e1448ea71b 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-4793,6
+4793,12
@@
static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
static void DoRequestBefore(void)
{
static void DoRequestBefore(void)
{
+ boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
+
+ // when showing request dialog after game ended, deactivate game panel
+ if (game_ended)
+ game.panel.active = FALSE;
+
if (game_status == GAME_MODE_PLAYING)
BlitScreenToBitmap(backbuffer);
if (game_status == GAME_MODE_PLAYING)
BlitScreenToBitmap(backbuffer);
@@
-4896,12
+4902,10
@@
static void DrawRequestDoorText(char *text)
static int RequestDoor(char *text, unsigned int req_state)
{
static int RequestDoor(char *text, unsigned int req_state)
{
- int draw_buffer_last = GetDrawtoField();
unsigned int old_door_state = GetDoorState();
unsigned int old_door_state = GetDoorState();
+ int draw_buffer_last = GetDrawtoField();
int result;
int result;
- DoRequestBefore();
-
if (old_door_state & DOOR_OPEN_1)
{
CloseDoor(DOOR_CLOSE_1);
if (old_door_state & DOOR_OPEN_1)
{
CloseDoor(DOOR_CLOSE_1);
@@
-4941,8
+4945,6
@@
static int RequestDoor(char *text, unsigned int req_state)
OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
}
OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
}
- DoRequestAfter();
-
return result;
}
return result;
}
@@
-4951,8
+4953,6
@@
static int RequestEnvelope(char *text, unsigned int req_state)
int draw_buffer_last = GetDrawtoField();
int result;
int draw_buffer_last = GetDrawtoField();
int result;
- DoRequestBefore();
-
DrawEnvelopeRequest(text, req_state);
ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
DrawEnvelopeRequest(text, req_state);
ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
@@
-4963,30
+4963,27
@@
static int RequestEnvelope(char *text, unsigned int req_state)
ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
- DoRequestAfter();
-
return result;
}
int Request(char *text, unsigned int req_state)
{
return result;
}
int Request(char *text, unsigned int req_state)
{
- boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
boolean overlay_enabled = GetOverlayEnabled();
int result;
boolean overlay_enabled = GetOverlayEnabled();
int result;
- // when showing request dialog after game ended, deactivate game panel
- if (game_ended)
- game.panel.active = FALSE;
-
game.request_active = TRUE;
SetOverlayEnabled(FALSE);
game.request_active = TRUE;
SetOverlayEnabled(FALSE);
+ DoRequestBefore();
+
if (global.use_envelope_request)
result = RequestEnvelope(text, req_state);
else
result = RequestDoor(text, req_state);
if (global.use_envelope_request)
result = RequestEnvelope(text, req_state);
else
result = RequestDoor(text, req_state);
+ DoRequestAfter();
+
SetOverlayEnabled(overlay_enabled);
game.request_active = FALSE;
SetOverlayEnabled(overlay_enabled);
game.request_active = FALSE;