fixed graphical bug with wrong draw buffer when using envelope request

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index f0fcae2929884c3eb2fc751a08b6a82313584c3d..099fd59de0c007460883d811c59d2997624745d1 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -391,6 +391,16 @@ int getLevelFromScreenY(int y)
     return getLevelFromScreenY_RND(y);
 }
 
     return getLevelFromScreenY_RND(y);
 }
 

+int getScreenFieldSizeX(void)
+{
+  return (tape.playing ? tape.scr_fieldx : SCR_FIELDX);
+}
+
+int getScreenFieldSizeY(void)
+{
+  return (tape.playing ? tape.scr_fieldy : SCR_FIELDY);
+}
+

 void DumpTile(int x, int y)
 {
   int sx = SCREENX(x);
 void DumpTile(int x, int y)
 {
   int sx = SCREENX(x);


@@ -4264,7 +4274,7 @@ void WaitForEventToContinue(void)
 #define MAX_REQUEST_LINE_FONT1_LEN     7
 #define MAX_REQUEST_LINE_FONT2_LEN     10
 
 #define MAX_REQUEST_LINE_FONT1_LEN     7
 #define MAX_REQUEST_LINE_FONT2_LEN     10
 

-static int RequestHandleEvents(unsigned int req_state)
+static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)

 {
   boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
                             checkGameEnded());
 {
   boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
                             checkGameEnded());


@@ -4293,7 +4303,7 @@ static int RequestHandleEvents(unsigned int req_state)
 
     if (game_just_ended)
     {
 
     if (game_just_ended)
     {

-      SetDrawtoField(draw_buffer_last);
+      SetDrawtoField(draw_buffer_game);

 
       HandleGameActions();
 
 
       HandleGameActions();
 


@@ -4594,6 +4604,7 @@ static int RequestHandleEvents(unsigned int req_state)
 
 static boolean RequestDoor(char *text, unsigned int req_state)
 {
 
 static boolean RequestDoor(char *text, unsigned int req_state)
 {

+  int draw_buffer_last = GetDrawtoField();

   unsigned int old_door_state;
   int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
   int font_nr = FONT_TEXT_2;
   unsigned int old_door_state;
   int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
   int font_nr = FONT_TEXT_2;


@@ -4735,7 +4746,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------

-  result = RequestHandleEvents(req_state);
+  result = RequestHandleEvents(req_state, draw_buffer_last);

 
   UnmapToolButtons();
 
 
   UnmapToolButtons();
 


@@ -4776,6 +4787,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
 
 static boolean RequestEnvelope(char *text, unsigned int req_state)
 {
 
 static boolean RequestEnvelope(char *text, unsigned int req_state)
 {

+  int draw_buffer_last = GetDrawtoField();

   int result;
 
   if (game_status == GAME_MODE_PLAYING)
   int result;
 
   if (game_status == GAME_MODE_PLAYING)


@@ -4827,7 +4839,7 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------

-  result = RequestHandleEvents(req_state);
+  result = RequestHandleEvents(req_state, draw_buffer_last);

 
   UnmapToolButtons();
 
 
   UnmapToolButtons();