Skip to content
Browse files

Config: path variables need to be resolved

  • Loading branch information...
1 parent c7cec61 commit 2ae2fb4acd0f634e2629786dce796fc5cf17e8fc @bradallred bradallred committed Jun 8, 2013
Showing with 9 additions and 8 deletions.
  1. +9 −8 gemrb/core/Interface.cpp
View
17 gemrb/core/Interface.cpp
@@ -1531,15 +1531,7 @@ int Interface::Init(InterfaceConfig* config)
} else var[0] = '\0'; \
value = NULL;
- CONFIG_STRING("GameCharactersPath", GameCharactersPath, "characters");
- CONFIG_STRING("GameDataPath", GameDataPath, "data");
- // TODO: make CustomFontPath cross platform and possibly dynamic
- CONFIG_STRING("CustomFontPath", CustomFontPath, "/usr/share/fonts/TTF");
CONFIG_STRING("GameName", GameName, GEMRB_STRING);
- CONFIG_STRING("GameOverridePath", GameOverridePath, "override");
- CONFIG_STRING("GamePortraitsPath", GamePortraitsPath, "portraits");
- CONFIG_STRING("GameScriptsPath", GameScriptsPath, "scripts");
- CONFIG_STRING("GameSoundsPath", GameSoundsPath, "sounds");
CONFIG_STRING("GameType", GameType, "auto");
// tob type is obsolete
if (stricmp( GameType, "tob" ) == 0) {
@@ -1560,6 +1552,15 @@ int Interface::Init(InterfaceConfig* config)
} else var[0] = '\0'; \
value = NULL;
+ // TODO: make CustomFontPath cross platform and possibly dynamic
+ CONFIG_PATH("CustomFontPath", CustomFontPath, "/usr/share/fonts/TTF");
+ CONFIG_PATH("GameCharactersPath", GameCharactersPath, "characters");
+ CONFIG_PATH("GameDataPath", GameDataPath, "data");
+ CONFIG_PATH("GameOverridePath", GameOverridePath, "override");
+ CONFIG_PATH("GamePortraitsPath", GamePortraitsPath, "portraits");
+ CONFIG_PATH("GameScriptsPath", GameScriptsPath, "scripts");
+ CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
+
// Path configureation
CONFIG_PATH("GemRBPath", GemRBPath,
CopyGemDataPath(GemRBPath, _MAX_PATH));

0 comments on commit 2ae2fb4

Please sign in to comment.
Something went wrong with that request. Please try again.