summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 150fb87..06e3f01 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -114,7 +114,7 @@ CApplication::CApplication()
m_active = false;
m_debugModes = 0;
- m_windowTitle = "COLOBOT GOLD";
+ m_windowTitle = "COLOBOT: Gold Edition";
m_simulationSuspended = false;
@@ -149,10 +149,16 @@ CApplication::CApplication()
m_mouseButtonsState = 0;
m_trackedKeys = 0;
+ #ifdef PORTABLE
+ m_dataPath = "./data";
+ m_langPath = "./lang";
+ #else
m_dataPath = GetSystemUtils()->GetDataPath();
m_langPath = GetSystemUtils()->GetLangPath();
- #if DEV_BUILD
- m_savePath = "saves";
+ #endif
+
+ #ifdef DEV_BUILD
+ m_savePath = "./saves";
#else
m_savePath = GetSystemUtils()->GetSaveDir();
#endif
@@ -694,7 +700,7 @@ bool CApplication::ChangeVideoConfig(const Gfx::GLDeviceConfig &newConfig)
std::string(SDL_GetError()) + std::string("\n") +
std::string("Previous mode will be restored");
GetLogger()->Error(error.c_str());
- GetSystemUtils()->SystemDialog( SDT_ERROR, "COLOBT - Error", error);
+ GetSystemUtils()->SystemDialog( SDT_ERROR, "COLOBOT - Error", error);
restore = true;
ChangeVideoConfig(m_lastDeviceConfig);
@@ -707,7 +713,7 @@ bool CApplication::ChangeVideoConfig(const Gfx::GLDeviceConfig &newConfig)
std::string error = std::string("SDL error while restoring previous video mode:\n") +
std::string(SDL_GetError());
GetLogger()->Error(error.c_str());
- GetSystemUtils()->SystemDialog( SDT_ERROR, "COLOBT - Fatal Error", error);
+ GetSystemUtils()->SystemDialog( SDT_ERROR, "COLOBOT - Fatal Error", error);
// Fatal error, so post the quit event