projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added dedicated setter function for setting game status
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index fbfad6103ac283a5270d040fcfde7107735b286f..d7bf92f573c5caf1e2de3945717ea60f2d6e6c9a 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-2059,6
+2059,7
@@
static void ReinitializeGraphics()
InitGadgets();
print_timestamp_time("InitGadgets");
InitToons();
InitGadgets();
print_timestamp_time("InitGadgets");
InitToons();
+ InitGlobalAnimations();
print_timestamp_time("InitToons");
InitDoors();
print_timestamp_time("InitDoors");
print_timestamp_time("InitToons");
InitDoors();
print_timestamp_time("InitDoors");
@@
-5698,7
+5699,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);
@@
-5733,7
+5734,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 */
@@
-5828,7
+5829,7
@@
void OpenAll()
{
print_timestamp_init("OpenAll");
{
print_timestamp_init("OpenAll");
-
game_status = GAME_MODE_LOADING
;
+
SetGameStatus(GAME_MODE_LOADING)
;
InitCounter();
InitCounter();
@@
-5928,7
+5929,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))