projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed loading custom PCX image files with default artwork file names
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 68875eb6de6da08aaa0834809bab859154844eba..8e2152a25b399a8459fb0da24267b1d209214ea1 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-614,7
+614,7
@@
char *getCustomImageFilename(char *basename)
if (!gfx.override_level_graphics)
{
/* 1st try: look for special artwork in current level series directory */
if (!gfx.override_level_graphics)
{
/* 1st try: look for special artwork in current level series directory */
- filename = get
Path
3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename);
+ filename = get
Img
3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename);
if (fileExists(filename))
return filename;
if (fileExists(filename))
return filename;
@@
-624,7
+624,7
@@
char *getCustomImageFilename(char *basename)
if (getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) != NULL)
{
/* 2nd try: look for special artwork configured in level series config */
if (getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) != NULL)
{
/* 2nd try: look for special artwork configured in level series config */
- filename = get
Path
2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename);
+ filename = get
Img
2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename);
if (fileExists(filename))
return filename;
if (fileExists(filename))
return filename;
@@
-638,7
+638,7
@@
char *getCustomImageFilename(char *basename)
if (!skip_setup_artwork)
{
/* 3rd try: look for special artwork in configured artwork directory */
if (!skip_setup_artwork)
{
/* 3rd try: look for special artwork in configured artwork directory */
- filename = get
Path
2(getSetupArtworkDir(artwork.gfx_current), basename);
+ filename = get
Img
2(getSetupArtworkDir(artwork.gfx_current), basename);
if (fileExists(filename))
return filename;
if (fileExists(filename))
return filename;
@@
-646,14
+646,14
@@
char *getCustomImageFilename(char *basename)
}
/* 4th try: look for default artwork in new default artwork directory */
}
/* 4th try: look for default artwork in new default artwork directory */
- filename = get
Path
2(getDefaultGraphicsDir(GFX_DEFAULT_SUBDIR), basename);
+ filename = get
Img
2(getDefaultGraphicsDir(GFX_DEFAULT_SUBDIR), basename);
if (fileExists(filename))
return filename;
free(filename);
/* 5th try: look for default artwork in old default artwork directory */
if (fileExists(filename))
return filename;
free(filename);
/* 5th try: look for default artwork in old default artwork directory */
- filename = get
Path
2(options.graphics_directory, basename);
+ filename = get
Img
2(options.graphics_directory, basename);
if (fileExists(filename))
return filename;
if (fileExists(filename))
return filename;
@@
-665,7
+665,7
@@
char *getCustomImageFilename(char *basename)
/* 6th try: look for fallback artwork in old default artwork directory */
/* (needed to prevent errors when trying to access unused artwork files) */
/* 6th try: look for fallback artwork in old default artwork directory */
/* (needed to prevent errors when trying to access unused artwork files) */
- filename = get
Path
2(options.graphics_directory, GFX_FALLBACK_FILENAME);
+ filename = get
Img
2(options.graphics_directory, GFX_FALLBACK_FILENAME);
if (fileExists(filename))
return filename;
#endif
if (fileExists(filename))
return filename;
#endif
@@
-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);