projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040111-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 864d0b3b6395753964fb40a791ac7403ab269247..b8f21640dd5ef6b781c36b72fb14cb6321a48115 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-3825,14
+3825,17
@@
static char *getNewArtworkIdentifier(int type)
return artwork_new_identifier;
}
return artwork_new_identifier;
}
-void ReloadCustomArtwork()
+void ReloadCustomArtwork(
int force_reload
)
{
char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
{
char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+ boolean force_reload_gfx = (force_reload & (1 << ARTWORK_TYPE_GRAPHICS));
+ boolean force_reload_snd = (force_reload & (1 << ARTWORK_TYPE_SOUNDS));
+ boolean force_reload_mus = (force_reload & (1 << ARTWORK_TYPE_MUSIC));
boolean redraw_screen = FALSE;
boolean redraw_screen = FALSE;
- if (gfx_new_identifier != NULL)
+ if (gfx_new_identifier != NULL
|| force_reload_gfx
)
{
#if 0
printf("RELOADING GRAPHICS '%s' -> '%s' ['%s', '%s']\n",
{
#if 0
printf("RELOADING GRAPHICS '%s' -> '%s' ['%s', '%s']\n",
@@
-3857,7
+3860,7
@@
void ReloadCustomArtwork()
redraw_screen = TRUE;
}
redraw_screen = TRUE;
}
- if (snd_new_identifier != NULL)
+ if (snd_new_identifier != NULL
|| force_reload_snd
)
{
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
{
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
@@
-3866,7
+3869,7
@@
void ReloadCustomArtwork()
redraw_screen = TRUE;
}
redraw_screen = TRUE;
}
- if (mus_new_identifier != NULL)
+ if (mus_new_identifier != NULL
|| force_reload_mus
)
{
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
{
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);