瀏覽代碼

Sensible default values

Thomas Buck 10 年之前
父節點
當前提交
bc04da966e
共有 4 個檔案被更改,包括 21 行新增1 行删除
  1. 4
    0
      ChangeLog.md
  2. 8
    0
      src/FontManager.cpp
  3. 6
    0
      src/RunTime.cpp
  4. 3
    1
      src/main.cpp

+ 4
- 0
ChangeLog.md 查看文件

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

+ 8
- 0
src/FontManager.cpp 查看文件

7
 
7
 
8
 #include "global.h"
8
 #include "global.h"
9
 #include "utils/strings.h"
9
 #include "utils/strings.h"
10
+#include "RunTime.h"
10
 #include "FontManager.h"
11
 #include "FontManager.h"
11
 #include "Font.h"
12
 #include "Font.h"
12
 #include "FontTRLE.h"
13
 #include "FontTRLE.h"
24
 
25
 
25
     mFontInit = false;
26
     mFontInit = false;
26
     font = -1;
27
     font = -1;
28
+
29
+    // Default font path
30
+#ifdef USING_SDL_FONT
31
+    setFont(getRunTime().getDataDir() + "/test.ttf");
32
+#else
33
+    setFont(getRunTime().getDataDir() + "/font.pc");
34
+#endif
27
 }
35
 }
28
 
36
 
29
 FontManager::~FontManager() {
37
 FontManager::~FontManager() {

+ 6
- 0
src/RunTime.cpp 查看文件

6
  */
6
  */
7
 
7
 
8
 #include "global.h"
8
 #include "global.h"
9
+#include "utils/strings.h"
9
 #include "RunTime.h"
10
 #include "RunTime.h"
10
 
11
 
11
 RunTime::RunTime() {
12
 RunTime::RunTime() {
13
+    baseDir = expandHomeDirectory("~/.OpenRaider");
14
+    pakDir = baseDir + "/paks";
15
+    audioDir = baseDir + "/music";
16
+    dataDir = baseDir + "/data";
17
+
12
     gameIsRunning = false;
18
     gameIsRunning = false;
13
 
19
 
14
 #ifdef DEBUG
20
 #ifdef DEBUG

+ 3
- 1
src/main.cpp 查看文件

109
     command_parse(&cmd, argc, argv);
109
     command_parse(&cmd, argc, argv);
110
     command_free(&cmd);
110
     command_free(&cmd);
111
 
111
 
112
+    // RunTime is required by other constructors
113
+    gRunTime.reset(new RunTime());
114
+
112
     gCamera.reset(new Camera());
115
     gCamera.reset(new Camera());
113
     gFont.reset(new FontManager());
116
     gFont.reset(new FontManager());
114
     gGame.reset(new Game());
117
     gGame.reset(new Game());
115
     gLog.reset(new Log());
118
     gLog.reset(new Log());
116
     gMenu.reset(new MenuFolder());
119
     gMenu.reset(new MenuFolder());
117
     gRender.reset(new Render());
120
     gRender.reset(new Render());
118
-    gRunTime.reset(new RunTime());
119
     gTextureManager.reset(new TextureManager());
121
     gTextureManager.reset(new TextureManager());
120
     gWorld.reset(new World());
122
     gWorld.reset(new World());
121
 
123
 

Loading…
取消
儲存