X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=ad36f123d2ffb3c90e0a159a35c483d6eb6c9f08;hb=23ac9d644d93650ac7b88a50f44e9f1b5cdffa60;hp=3ec8d328d1dca951c9d7e00bd77749cd0652e9d7;hpb=4231c290a878b5fb95bffdf78b5486359ce1268f;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 3ec8d328..ad36f123 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -205,16 +205,16 @@ void DrawMaskedBorder_Rect(int x, int y, int width, int height)
 
 void DrawMaskedBorder_FIELD()
 {
-  if (game_status >= GAME_MODE_TITLE &&
-      game_status <= GAME_MODE_PLAYING &&
-      border.draw_masked[game_status])
+  if (global.border_status >= GAME_MODE_TITLE &&
+      global.border_status <= GAME_MODE_PLAYING &&
+      border.draw_masked[global.border_status])
     DrawMaskedBorder_Rect(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
 }
 
 void DrawMaskedBorder_DOOR_1()
 {
   if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] &&
-      (game_status != GAME_MODE_EDITOR ||
+      (global.border_status != GAME_MODE_EDITOR ||
        border.draw_masked[GFX_SPECIAL_ARG_EDITOR]))
     DrawMaskedBorder_Rect(DX, DY, DXSIZE, DYSIZE);
 }
@@ -222,7 +222,7 @@ void DrawMaskedBorder_DOOR_1()
 void DrawMaskedBorder_DOOR_2()
 {
   if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] &&
-      game_status != GAME_MODE_EDITOR)
+      global.border_status != GAME_MODE_EDITOR)
     DrawMaskedBorder_Rect(VX, VY, VXSIZE, VYSIZE);
 }
 
@@ -585,7 +585,10 @@ void FadeExt(int fade_mask, int fade_mode)
     fade_delay = fading.fade_delay;
     post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
 
-    draw_border_function = DrawMaskedBorder_FIELD;
+    if (border.draw_masked_when_fading)
+      draw_border_function = DrawMaskedBorder_FIELD;	/* update when fading */
+    else
+      DrawMaskedBorder_FIELD();				/* draw once */
   }
   else		/* REDRAW_ALL */
   {
@@ -620,6 +623,31 @@ void FadeExt(int fade_mask, int fade_mode)
 
 void FadeIn(int fade_mask)
 {
+#if 0
+  global.border_status = game_status;
+#endif
+
+#if 0
+  global.fading_status = game_status;
+
+  if (global.fading_type == TYPE_ENTER_MENU)
+    fading = menu.enter_menu;
+  else if (global.fading_type == TYPE_LEAVE_MENU)
+    fading = menu.leave_menu;
+  else if (global.fading_type == TYPE_ENTER_SCREEN)
+    fading = menu.enter_screen[global.fading_status];
+  else if (global.fading_type == TYPE_LEAVE_SCREEN)
+    fading = menu.leave_screen[global.fading_status];
+
+  printf("::: FadeIn: %s [0x%08x] [%d]\n",
+	 global.fading_type == TYPE_ENTER_MENU ? "enter_menu" :
+	 global.fading_type == TYPE_LEAVE_MENU ? "leave_menu" :
+	 global.fading_type == TYPE_ENTER_SCREEN ? "enter_screen" :
+	 global.fading_type == TYPE_LEAVE_SCREEN ? "leave_screen" : "(?)",
+	 global.fading_type,
+	 global.fading_status);
+#endif
+
 #if 1
   // printf("::: now fading in...\n");
 
@@ -641,6 +669,25 @@ void FadeIn(int fade_mask)
 
 void FadeOut(int fade_mask)
 {
+#if 0
+  if (global.fading_type == TYPE_ENTER_MENU)
+    fading = menu.enter_menu;
+  else if (global.fading_type == TYPE_LEAVE_MENU)
+    fading = menu.leave_menu;
+  else if (global.fading_type == TYPE_ENTER_SCREEN)
+    fading = menu.enter_screen[global.fading_status];
+  else if (global.fading_type == TYPE_LEAVE_SCREEN)
+    fading = menu.leave_screen[global.fading_status];
+
+  printf("::: FadeOut: %s [0x%08x] [%d]\n",
+	 global.fading_type == TYPE_ENTER_MENU ? "enter_menu" :
+	 global.fading_type == TYPE_LEAVE_MENU ? "leave_menu" :
+	 global.fading_type == TYPE_ENTER_SCREEN ? "enter_screen" :
+	 global.fading_type == TYPE_LEAVE_SCREEN ? "leave_screen" : "(?)",
+	 global.fading_type,
+	 global.fading_status);
+#endif
+
 #if 1
   // printf("::: fading.fade_mode == %d\n", fading.fade_mode);
 
@@ -658,6 +705,10 @@ void FadeOut(int fade_mask)
   FadeExt(fade_mask, FADE_MODE_FADE_OUT);
 #endif
 #endif
+
+#if 1
+  global.border_status = game_status;
+#endif
 }
 
 void FadeCross(int fade_mask)
@@ -670,6 +721,32 @@ void FadeCrossSaveBackbuffer()
   BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 }
 
+#if 0
+void FadeSetEnterMenu()
+{
+  global.fading_type = TYPE_ENTER_MENU;
+}
+
+void FadeSetLeaveMenu()
+{
+  global.fading_type = TYPE_LEAVE_MENU;
+}
+
+void FadeSetEnterScreen()
+{
+  global.fading_type = TYPE_ENTER_SCREEN;
+}
+
+void FadeSetLeaveScreen()
+{
+  // global.fading_type = TYPE_LEAVE_SCREEN;
+
+  global.fading_type = (global.fading_type == TYPE_ENTER_SCREEN ?
+			TYPE_LEAVE_SCREEN : TYPE_LEAVE_MENU);
+}
+
+#else
+
 static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set)
 {
   static struct TitleFadingInfo fading_leave_stored;
@@ -684,6 +761,10 @@ void FadeSetEnterMenu()
 {
   fading = menu.enter_menu;
 
+#if 0
+  printf("::: storing enter_menu\n");
+#endif
+
   FadeSetLeaveNext(fading, TRUE);	/* (keep same fade mode) */
 }
 
@@ -691,6 +772,10 @@ void FadeSetLeaveMenu()
 {
   fading = menu.leave_menu;
 
+#if 0
+  printf("::: storing leave_menu\n");
+#endif
+
   FadeSetLeaveNext(fading, TRUE);	/* (keep same fade mode) */
 }
 
@@ -698,14 +783,32 @@ void FadeSetEnterScreen()
 {
   fading = menu.enter_screen[game_status];
 
+#if 0
+  printf("::: storing leave_screen[%d]\n", game_status);
+#endif
+
+#if 0
+  printf("::: - %d, %d / %d, %d\n",
+	 menu.enter_screen[game_status].fade_mode,
+	 menu.enter_screen[game_status].fade_delay,
+	 menu.leave_screen[game_status].fade_mode,
+	 menu.leave_screen[game_status].fade_delay);
+#endif
+
   FadeSetLeaveNext(menu.leave_screen[game_status], TRUE);	/* store */
 }
 
 void FadeSetLeaveScreen()
 {
+#if 0
+  printf("::: recalling last stored value\n");
+#endif
+
   FadeSetLeaveNext(menu.leave_screen[game_status], FALSE);	/* recall */
 }
 
+#endif
+
 void FadeSetFromType(int type)
 {
   if (type & TYPE_ENTER_SCREEN)