diff options
author | Bardur Arantsson <bardur@scientician.net> | 2017-05-02 19:20:57 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2017-05-02 19:20:57 +0200 |
commit | c2ff640e5540fd4c55dd054ae87dd510a11155e9 (patch) | |
tree | 8fd979ae25c446724f9506dd66395a48b05b32d2 /src | |
parent | aae967c8a33e1aad994b7349abad7fbd447264bb (diff) |
Move "Game" initialization to main_real()
Diffstat (limited to 'src')
-rw-r--r-- | src/init2.cc | 3 | ||||
-rw-r--r-- | src/main.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/init2.cc b/src/init2.cc index 1b83851e..88fd5470 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -1038,9 +1038,6 @@ void init_angband(void) char buf[1024]; - // Initialize game structure - game = new Game(); - /* Init some VERY basic stuff, like macro arrays */ init_basic(); diff --git a/src/main.cc b/src/main.cc index 7badc9bb..9dd49aaa 100644 --- a/src/main.cc +++ b/src/main.cc @@ -11,6 +11,7 @@ #include "birth.hpp" #include "dungeon.h" #include "files.hpp" +#include "game.hpp" #include "init2.h" #include "modules.hpp" #include "util.h" @@ -131,6 +132,9 @@ int main_real(int argc, char *argv[], char const *platform_sys, int (*init_platf bool_ args = TRUE; + // Initialize game structure + game = new Game(); + /* Get the file paths */ init_file_paths_with_env(); |