X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=78965ba032268ae5e3181ed3a25599c1092fa158;hb=8c1ac40c6c66b49fa4df93d2f1937ba5ceb78e7e;hp=01434554fc94a36b62ba966044442355baef48ee;hpb=343ecd1bed93fa862903ff981ede342825f14401;p=rocksndiamonds.git

diff --git a/src/anim.c b/src/anim.c
index 01434554..78965ba0 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -178,14 +178,18 @@ struct GameModeAnimClass
   { GAME_MODE_TITLE_3,			ANIM_CLASS_TITLE		},
   { GAME_MODE_TITLE_4,			ANIM_CLASS_TITLE		},
   { GAME_MODE_TITLE_5,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_NAMES, 			ANIM_CLASS_TOONS_MENU_SUBMENU	},
   { GAME_MODE_LEVELS, 			ANIM_CLASS_TOONS_MENU_SUBMENU	},
   { GAME_MODE_LEVELNR,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
   { GAME_MODE_INFO,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
   { GAME_MODE_SETUP,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_PSEUDO_NAMESONLY,		ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_PSEUDO_TYPENAMES,		ANIM_CLASS_TOONS_MENU_SUBMENU	},
   { GAME_MODE_PSEUDO_MAINONLY,		ANIM_CLASS_TOONS_MENU_MAIN	},
   { GAME_MODE_PSEUDO_TYPENAME,		ANIM_CLASS_TOONS_MENU_MAIN	},
   { GAME_MODE_PSEUDO_SCORESOLD,		ANIM_CLASS_TOONS_SCORES		},
   { GAME_MODE_PSEUDO_SCORESNEW,		ANIM_CLASS_TOONS_SCORES		},
+  { GAME_MODE_SCOREINFO,		ANIM_CLASS_TOONS_SCORES		},
   { GAME_MODE_EDITOR,			ANIM_CLASS_NO_TITLE		},
   { GAME_MODE_PLAYING,			ANIM_CLASS_NO_TITLE		},
 
@@ -642,9 +646,11 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
     if (drawing_target == DRAW_TO_FADE_TARGET)
       after_fading = TRUE;
 
-    // special case: changing from/to this screen is done without fading
-    if (global.anim_status == GAME_MODE_PSEUDO_TYPENAME ||
-	anim_status_last   == GAME_MODE_PSEUDO_TYPENAME)
+    // special case: changing from/to these screens is done without fading
+    if (global.anim_status == GAME_MODE_PSEUDO_TYPENAME  ||
+	global.anim_status == GAME_MODE_PSEUDO_TYPENAMES ||
+	anim_status_last   == GAME_MODE_PSEUDO_TYPENAME  ||
+	anim_status_last   == GAME_MODE_PSEUDO_TYPENAMES)
       after_fading = TRUE;
 
     // ---------- part 1 ------------------------------------------------------
@@ -820,8 +826,8 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
 
 	gfx.anim_random_frame = last_anim_random_frame;
 
-	getFixedGraphicSource(part->graphic, frame, &src_bitmap,
-			      &src_x, &src_y);
+	getGlobalAnimGraphicSource(part->graphic, frame, &src_bitmap,
+				   &src_x, &src_y);
 
 	src_x += cut_x;
 	src_y += cut_y;
@@ -865,6 +871,8 @@ void DrawGlobalAnimations(int drawing_target, int drawing_stage)
     ResetGlobalAnim_Clicked();
   }
 
+  DrawEnvelopeRequestToScreen(drawing_target, drawing_stage);
+
   if (gfx.cursor_mode_override != last_cursor_mode_override)
     SetMouseCursor(gfx.cursor_mode);
 }