diff options
| author | Leon Krause <lk@leonkrause.com> | 2018-05-12 13:21:26 +0200 |
|---|---|---|
| committer | Leon Krause <lk@leonkrause.com> | 2018-05-12 13:31:03 +0200 |
| commit | 430d84769c1f18b82448d242d4a2a33e24b2a630 (patch) | |
| tree | a4352e1a455508b2954b1c139d208ab9326df7e4 /main/main.cpp | |
| parent | 5b4974f171ea1a8467049c85cd0c3c5011e39c18 (diff) | |
Change reused variable name in command line parsing
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/main.cpp b/main/main.cpp index cf1db2b85e..5836c9c739 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -337,7 +337,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph String video_driver = ""; String audio_driver = ""; - String game_path = "."; + String project_path = "."; bool upwards = false; String debug_mode; String debug_host; @@ -553,7 +553,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (OS::get_singleton()->set_cwd(p) == OK) { //nothing } else { - game_path = I->next()->get(); //use game_path instead + project_path = I->next()->get(); //use project_path instead } N = I->next()->next(); } else { @@ -576,7 +576,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (OS::get_singleton()->set_cwd(path) == OK) { // path already specified, don't override } else { - game_path = path; + project_path = path; } #ifdef TOOLS_ENABLED editor = true; @@ -678,14 +678,14 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph I = N; } - if (globals->setup(game_path, main_pack, upwards) == OK) { + if (globals->setup(project_path, main_pack, upwards) == OK) { found_project = true; } else { #ifdef TOOLS_ENABLED editor = false; #else - OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data()); + OS::get_singleton()->print("Error: Could not load game path '%s'.\n", project_path.ascii().get_data()); goto error; #endif @@ -976,7 +976,7 @@ error: video_driver = ""; audio_driver = ""; - game_path = ""; + project_path = ""; args.clear(); main_args.clear(); |