X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=940ce6edc91e1c1854b9a2fa1bea2b113c2f17d5;hb=f8593619214e4b0a70d4c92c959dd050c92045d6;hp=1fe2d9543d644d1cc29a0f9af9376934bf48d958;hpb=0f6832ff60f9beba4f1dd347ba9b78aafd806e82;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 1fe2d954..940ce6ed 100644 --- a/src/files.c +++ b/src/files.c @@ -2924,31 +2924,12 @@ static int getFiletypeFromID(char *filetype_id) char *getLocalLevelTemplateFilename(void) { - return getDefaultLevelFilename(-1); + return getLevelFilenameFromBasename(LEVELTEMPLATE_FILENAME); } char *getGlobalLevelTemplateFilename(void) { - // global variable "leveldir_current" must be modified in the loop below - LevelDirTree *leveldir_current_last = leveldir_current; - char *filename = NULL; - - // check for template level in path from current to topmost tree node - - while (leveldir_current != NULL) - { - filename = getDefaultLevelFilename(-1); - - if (fileExists(filename)) - break; - - leveldir_current = leveldir_current->node_parent; - } - - // restore global variable "leveldir_current" modified in above loop - leveldir_current = leveldir_current_last; - - return filename; + return getFilenameFromCurrentLevelDirUpward(LEVELTEMPLATE_FILENAME); } static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi)