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

diff --git a/src/tools.c b/src/tools.c
index bd235f94..8610e510 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -8277,7 +8277,17 @@ void JoinRectangles(int *x, int *y, int *width, int *height,
 
 void SetAnimStatus(int anim_status_new)
 {
+  if (anim_status_new == GAME_MODE_MAIN)
+    anim_status_new = GAME_MODE_PSEUDO_MAINONLY;
+
   global.anim_status_next = anim_status_new;
+
+  // directly set screen modes that are entered without fading
+  if ((global.anim_status      == GAME_MODE_PSEUDO_MAINONLY &&
+       global.anim_status_next == GAME_MODE_PSEUDO_TYPENAME) ||
+      (global.anim_status      == GAME_MODE_PSEUDO_TYPENAME &&
+       global.anim_status_next == GAME_MODE_PSEUDO_MAINONLY))
+    global.anim_status = global.anim_status_next;
 }
 
 void SetGameStatus(int game_status_new)