projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed some smaller issues with loading custom artwork
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 68875eb6de6da08aaa0834809bab859154844eba..b07f2fdf40dd551793167c95d765b2401037a312 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-2875,8
+2875,7
@@
static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
(leveldir_new->user_defined || !leveldir_new->handicap ?
leveldir_new->last_level : leveldir_new->first_level);
(leveldir_new->user_defined || !leveldir_new->handicap ?
leveldir_new->last_level : leveldir_new->first_level);
- DrawInitTextExt(leveldir_new->name, 150, FC_YELLOW,
- leveldir_new->level_group);
+ DrawInitText(leveldir_new->name, 150, FC_YELLOW);
pushTreeInfo(node_first, leveldir_new);
pushTreeInfo(node_first, leveldir_new);
@@
-3027,9
+3026,7
@@
static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
{
while ((dir_entry = readDirectory(dir)) != NULL)
{
{
while ((dir_entry = readDirectory(dir)) != NULL)
{
- char *entry_name = dir_entry->basename;
-
- if (FileIsArtworkType(entry_name, type))
+ if (FileIsArtworkType(dir_entry->filename, type))
{
valid_file_found = TRUE;
{
valid_file_found = TRUE;
@@
-3342,8
+3339,7
@@
void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
setArtworkInfoCacheEntry(artwork_new, level_node, type);
}
setArtworkInfoCacheEntry(artwork_new, level_node, type);
}
- DrawInitTextExt(level_node->name, 150, FC_YELLOW,
- level_node->level_group);
+ DrawInitText(level_node->name, 150, FC_YELLOW);
if (level_node->node_group != NULL)
LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group);
if (level_node->node_group != NULL)
LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group);