projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f728989
)
added reading settings for busy animation from custom artwork config
author
Holger Schemel
<info@artsoft.org>
Sat, 12 Mar 2022 16:01:26 +0000
(17:01 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sat, 12 Mar 2022 16:01:26 +0000
(17:01 +0100)
src/init.c
patch
|
blob
|
history
diff --git
a/src/init.c
b/src/init.c
index 020b4d1d5e7607c044f72fc7c851bafcdaad0e16..66ba68ac1d4726d1f1eca081eee2bddf44750e23 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-5600,6
+5600,8
@@
static void InitGfx(void)
DrawInitTextHead("Loading graphics");
DrawInitTextHead("Loading graphics");
+ InitMenuDesignSettings_Static();
+
// initialize settings for busy animation with default values
int parameter[NUM_GFX_ARGS];
for (i = 0; i < NUM_GFX_ARGS; i++)
// initialize settings for busy animation with default values
int parameter[NUM_GFX_ARGS];
for (i = 0; i < NUM_GFX_ARGS; i++)
@@
-5641,6
+5643,9
@@
static void InitGfx(void)
}
}
}
}
+ // read values from custom graphics config file
+ InitMenuDesignSettings_FromHash(setup_file_hash, FALSE);
+
freeSetupFileHash(setup_file_hash);
}
}
freeSetupFileHash(setup_file_hash);
}
}
@@
-5688,8
+5693,6
@@
static void InitGfx(void)
init.busy.width = anim_initial.width;
init.busy.height = anim_initial.height;
init.busy.width = anim_initial.width;
init.busy.height = anim_initial.height;
- InitMenuDesignSettings_Static();
-
InitGfxDrawBusyAnimFunction(DrawInitAnim);
InitGfxDrawGlobalAnimFunction(DrawGlobalAnimations);
InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);
InitGfxDrawBusyAnimFunction(DrawInitAnim);
InitGfxDrawGlobalAnimFunction(DrawGlobalAnimations);
InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);