projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8eab6de
)
added wrapper function for creating level set custom artwork tree
author
Holger Schemel
<info@artsoft.org>
Mon, 1 Feb 2021 19:39:38 +0000
(20:39 +0100)
committer
Holger Schemel
<info@artsoft.org>
Mon, 1 Feb 2021 19:39:38 +0000
(20:39 +0100)
src/libgame/setup.c
patch
|
blob
|
history
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 3e044e96b44630cdb556e5a13a874175db06a1c3..1c7d78b660c6ba0215c18f6623460c5e579c3ace 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-3923,9
+3923,9
@@
void LoadArtworkInfo(void)
#endif
}
#endif
}
-static void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
- ArtworkDirTree *node_parent,
- LevelDirTree *level_node)
+static void LoadArtworkInfoFromLevelInfo
Ext
(ArtworkDirTree **artwork_node,
+
ArtworkDirTree *node_parent,
+
LevelDirTree *level_node)
{
int type = (*artwork_node)->type;
{
int type = (*artwork_node)->type;
@@
-3994,8
+3994,8
@@
static void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
createParentTreeInfoNode(artwork_new);
// recursively step into sub-directory and look for more custom artwork
createParentTreeInfoNode(artwork_new);
// recursively step into sub-directory and look for more custom artwork
- LoadArtworkInfoFromLevelInfo(&artwork_new->node_group, artwork_new,
- level_node->node_group);
+ LoadArtworkInfoFromLevelInfo
Ext
(&artwork_new->node_group, artwork_new,
+
level_node->node_group);
// if sub-tree has no custom artwork at all, remove it
if (artwork_new->node_group->next == NULL)
// if sub-tree has no custom artwork at all, remove it
if (artwork_new->node_group->next == NULL)
@@
-4006,6
+4006,11
@@
static void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
}
}
}
}
+static void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node)
+{
+ LoadArtworkInfoFromLevelInfoExt(artwork_node, NULL, leveldir_first_all);
+}
+
void LoadLevelArtworkInfo(void)
{
print_timestamp_init("LoadLevelArtworkInfo");
void LoadLevelArtworkInfo(void)
{
print_timestamp_init("LoadLevelArtworkInfo");
@@
-4014,11
+4019,11
@@
void LoadLevelArtworkInfo(void)
print_timestamp_time("DrawTimeText");
print_timestamp_time("DrawTimeText");
- LoadArtworkInfoFromLevelInfo(&artwork.gfx_first
, NULL, leveldir_first_all
);
+ LoadArtworkInfoFromLevelInfo(&artwork.gfx_first);
print_timestamp_time("LoadArtworkInfoFromLevelInfo (gfx)");
print_timestamp_time("LoadArtworkInfoFromLevelInfo (gfx)");
- LoadArtworkInfoFromLevelInfo(&artwork.snd_first
, NULL, leveldir_first_all
);
+ LoadArtworkInfoFromLevelInfo(&artwork.snd_first);
print_timestamp_time("LoadArtworkInfoFromLevelInfo (snd)");
print_timestamp_time("LoadArtworkInfoFromLevelInfo (snd)");
- LoadArtworkInfoFromLevelInfo(&artwork.mus_first
, NULL, leveldir_first_all
);
+ LoadArtworkInfoFromLevelInfo(&artwork.mus_first);
print_timestamp_time("LoadArtworkInfoFromLevelInfo (mus)");
SaveArtworkInfoCache();
print_timestamp_time("LoadArtworkInfoFromLevelInfo (mus)");
SaveArtworkInfoCache();