Sensible default values

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141007 ]
+    * Set all RunTime vars to sensible defaults, so OpenRaider can try to start
+      without a config file (a font is still required!)
+
     [ 20140930 ]
     * Updated imgui to version 1.14 wip
     * Console input keeps keyboard focus after command input

src/FontManager.cpp

@@ -7,6 +7,7 @@
 
 #include "global.h"
 #include "utils/strings.h"
+#include "RunTime.h"
 #include "FontManager.h"
 #include "Font.h"
 #include "FontTRLE.h"
@@ -24,6 +25,13 @@ FontManager::FontManager() {
 
     mFontInit = false;
     font = -1;
+
+    // Default font path
+#ifdef USING_SDL_FONT
+    setFont(getRunTime().getDataDir() + "/test.ttf");
+#else
+    setFont(getRunTime().getDataDir() + "/font.pc");
+#endif
 }
 
 FontManager::~FontManager() {

src/RunTime.cpp

@@ -6,9 +6,15 @@
  */
 
 #include "global.h"
+#include "utils/strings.h"
 #include "RunTime.h"
 
 RunTime::RunTime() {
+    baseDir = expandHomeDirectory("~/.OpenRaider");
+    pakDir = baseDir + "/paks";
+    audioDir = baseDir + "/music";
+    dataDir = baseDir + "/data";
+
     gameIsRunning = false;
 
 #ifdef DEBUG

src/main.cpp

@@ -109,13 +109,15 @@ int main(int argc, char* argv[]) {
     command_parse(&cmd, argc, argv);
     command_free(&cmd);
 
+    // RunTime is required by other constructors
+    gRunTime.reset(new RunTime());
+
     gCamera.reset(new Camera());
     gFont.reset(new FontManager());
     gGame.reset(new Game());
     gLog.reset(new Log());
     gMenu.reset(new MenuFolder());
     gRender.reset(new Render());
-    gRunTime.reset(new RunTime());
     gTextureManager.reset(new TextureManager());
     gWorld.reset(new World());