projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into global-anims
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 0aa2f102a956fad6ac9f930f1ea292a68d7030a9..e7cbd04a43af6d10c3515e66e5300a32469dd393 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");
@@
-5318,6
+5322,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;