X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=7f870a64db40378ebfca13f31fa864c18ff5783f;hb=8fbf8a2b1afed9d7b6fec76463eeff17405608a7;hp=8610e5103476b976aa2731326f38226e22fb99a8;hpb=3466bff66861926f480a96e5b8923a4e044d50a4;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 8610e510..7f870a64 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -66,83 +66,83 @@ static struct DoorPartControlInfo door_part_controls[] =
 {
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_1,
+    IMG_GFX_DOOR_1_PART_1,
     &door_1.part_1
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_2,
+    IMG_GFX_DOOR_1_PART_2,
     &door_1.part_2
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_3,
+    IMG_GFX_DOOR_1_PART_3,
     &door_1.part_3
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_4,
+    IMG_GFX_DOOR_1_PART_4,
     &door_1.part_4
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_5,
+    IMG_GFX_DOOR_1_PART_5,
     &door_1.part_5
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_6,
+    IMG_GFX_DOOR_1_PART_6,
     &door_1.part_6
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_7,
+    IMG_GFX_DOOR_1_PART_7,
     &door_1.part_7
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_8,
+    IMG_GFX_DOOR_1_PART_8,
     &door_1.part_8
   },
 
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_1,
+    IMG_GFX_DOOR_2_PART_1,
     &door_2.part_1
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_2,
+    IMG_GFX_DOOR_2_PART_2,
     &door_2.part_2
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_3,
+    IMG_GFX_DOOR_2_PART_3,
     &door_2.part_3
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_4,
+    IMG_GFX_DOOR_2_PART_4,
     &door_2.part_4
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_5,
+    IMG_GFX_DOOR_2_PART_5,
     &door_2.part_5
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_6,
+    IMG_GFX_DOOR_2_PART_6,
     &door_2.part_6
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_7,
+    IMG_GFX_DOOR_2_PART_7,
     &door_2.part_7
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_8,
+    IMG_GFX_DOOR_2_PART_8,
     &door_2.part_8
   },
 
@@ -174,9 +174,6 @@ static int el_act2crm(int, int);
 static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
 static int request_gadget_id = -1;
 
-static unsigned int sync_frame_delay = 0;
-static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
-
 static char *print_if_not_empty(int element)
 {
   static char *s = NULL;
@@ -590,6 +587,17 @@ void BackToFront()
 #endif
 }
 
+void BackToFront_WithFrameDelay(unsigned int frame_delay_value)
+{
+  unsigned int frame_delay_value_old = GetVideoFrameDelay();
+
+  SetVideoFrameDelay(frame_delay_value);
+
+  BackToFront();
+
+  SetVideoFrameDelay(frame_delay_value_old);
+}
+
 static void FadeCrossSaveBackbuffer()
 {
   BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
@@ -3547,7 +3555,7 @@ void WaitForEventToContinue()
 
     DoAnimation();
 
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
+    BackToFront();
   }
 }
 
@@ -3721,8 +3729,6 @@ static int RequestHandleEvents(unsigned int req_state)
     }
 
     BackToFront();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   return result;
@@ -4037,8 +4043,8 @@ void InitGraphicCompatibilityInfo_Doors()
   }
   doors[] =
   {
-    { DOOR_1,	IMG_DOOR_1_GFX_PART_1,	IMG_DOOR_1_GFX_PART_8,	&door_1	},
-    { DOOR_2,	IMG_DOOR_2_GFX_PART_1,	IMG_DOOR_2_GFX_PART_8,	&door_2	},
+    { DOOR_1,	IMG_GFX_DOOR_1_PART_1,	IMG_GFX_DOOR_1_PART_8,	&door_1	},
+    { DOOR_2,	IMG_GFX_DOOR_2_PART_1,	IMG_GFX_DOOR_2_PART_8,	&door_2	},
 
     { -1,	-1,			-1,			NULL	}
   };
@@ -4684,31 +4690,31 @@ static struct
 } toolbutton_info[NUM_TOOL_BUTTONS] =
 {
   {
-    IMG_REQUEST_BUTTON_GFX_YES,		&request.button.yes,
+    IMG_GFX_REQUEST_BUTTON_YES,		&request.button.yes,
     TOOL_CTRL_ID_YES,			"yes"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_NO,		&request.button.no,
+    IMG_GFX_REQUEST_BUTTON_NO,		&request.button.no,
     TOOL_CTRL_ID_NO,			"no"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_CONFIRM,	&request.button.confirm,
+    IMG_GFX_REQUEST_BUTTON_CONFIRM,	&request.button.confirm,
     TOOL_CTRL_ID_CONFIRM,		"confirm"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_1,	&request.button.player_1,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_1,	&request.button.player_1,
     TOOL_CTRL_ID_PLAYER_1,		"player 1"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_2,	&request.button.player_2,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_2,	&request.button.player_2,
     TOOL_CTRL_ID_PLAYER_2,		"player 2"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_3,	&request.button.player_3,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_3,	&request.button.player_3,
     TOOL_CTRL_ID_PLAYER_3,		"player 3"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_4,	&request.button.player_4,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_4,	&request.button.player_4,
     TOOL_CTRL_ID_PLAYER_4,		"player 4"
   }
 };