projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wrong screen transitions by forced screen redraw in every frame
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index e7cbd04a43af6d10c3515e66e5300a32469dd393..54bdb1e6b381d085818c513f01f39326270b0330 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-4666,7
+4666,8
@@
static void InitGlobal()
global.frames_per_second = 0;
global.frames_per_second = 0;
- global.border_status = GAME_MODE_MAIN;
+ global.border_status = GAME_MODE_LOADING;
+ global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
global.use_envelope_request = FALSE;
}
global.use_envelope_request = FALSE;
}
@@
-5699,7
+5700,7
@@
void ReloadCustomArtwork(int force_reload)
print_timestamp_init("ReloadCustomArtwork");
print_timestamp_init("ReloadCustomArtwork");
-
game_status = GAME_MODE_LOADING
;
+
SetGameStatus(GAME_MODE_LOADING)
;
FadeOut(REDRAW_ALL);
FadeOut(REDRAW_ALL);
@@
-5734,7
+5735,7
@@
void ReloadCustomArtwork(int force_reload)
print_timestamp_time("InitMusic");
}
print_timestamp_time("InitMusic");
}
-
game_status = last_game_status;
/* restore current game status */
+
SetGameStatus(last_game_status);
/* restore current game status */
init_last = init; /* switch to new busy animation */
init_last = init; /* switch to new busy animation */
@@
-5829,7
+5830,7
@@
void OpenAll()
{
print_timestamp_init("OpenAll");
{
print_timestamp_init("OpenAll");
-
game_status = GAME_MODE_LOADING
;
+
SetGameStatus(GAME_MODE_LOADING)
;
InitCounter();
InitCounter();
@@
-5929,7
+5930,7
@@
void OpenAll()
return;
}
return;
}
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
FadeSetEnterScreen();
if (!(fading.fade_mode & FADE_TYPE_TRANSFORM))
FadeSetEnterScreen();
if (!(fading.fade_mode & FADE_TYPE_TRANSFORM))