projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduced minimum required screen frame rate at startup (for speed-up)
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 0aa2f102a956fad6ac9f930f1ea292a68d7030a9..54bdb1e6b381d085818c513f01f39326270b0330 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-232,6
+232,9
@@
void InitImageTextures()
FreeAllImageTextures();
FreeAllImageTextures();
+ for (i = IMG_GLOBAL_BORDER_FIRST; i <= IMG_GLOBAL_BORDER_LAST; i++)
+ CreateImageTextures(i);
+
for (i = 0; i < MAX_NUM_TOONS; i++)
CreateImageTextures(IMG_TOON_1 + i);
for (i = 0; i < MAX_NUM_TOONS; i++)
CreateImageTextures(IMG_TOON_1 + i);
@@
-2056,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");
@@
-4662,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;
}
@@
-5318,6
+5323,7
@@
void InitGfx()
InitGfxDrawBusyAnimFunction(DrawInitAnim);
InitGfxDrawGlobalAnimFunction(DrawGlobalAnim);
InitGfxDrawBusyAnimFunction(DrawInitAnim);
InitGfxDrawGlobalAnimFunction(DrawGlobalAnim);
+ InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToScreen);
/* use copy of busy animation to prevent change while reloading artwork */
init_last = init;
/* use copy of busy animation to prevent change while reloading artwork */
init_last = init;
@@
-5694,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);
@@
-5729,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 */
@@
-5824,7
+5830,7
@@
void OpenAll()
{
print_timestamp_init("OpenAll");
{
print_timestamp_init("OpenAll");
-
game_status = GAME_MODE_LOADING
;
+
SetGameStatus(GAME_MODE_LOADING)
;
InitCounter();
InitCounter();
@@
-5924,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))