diff options
| author | Rémi Verschelde | 2017-05-02 11:32:48 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-02 11:32:48 +0200 |
| commit | acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d (patch) | |
| tree | 9c51789ed5f03364c8714bbcbb0d5be35ffbfeb9 /main/main.cpp | |
| parent | 8e64b27585c416095fbfae0f8c7aca618519e43b (diff) | |
| parent | 7ce8342ac5c0e0a302559d3ef561ffd9dc74ff2c (diff) | |
| download | godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.tar.gz godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.tar.zst godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.zip | |
Merge pull request #8610 from akien-mga/project-file-extension
Rename project file to "project.godot"
Diffstat (limited to '')
| -rw-r--r-- | main/main.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index ad7ca84d6..33095e859 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -129,7 +129,7 @@ void Main::print_help(const char *p_binary) { OS::get_singleton()->print(VERSION_FULL_NAME " (c) 2008-2017 Juan Linietsky, Ariel Manzur.\n"); OS::get_singleton()->print("Usage: %s [options] [scene]\n", p_binary); OS::get_singleton()->print("Options:\n"); - OS::get_singleton()->print("\t-path [dir] : Path to a game, containing godot.cfg\n"); + OS::get_singleton()->print("\t-path [dir] : Path to a game, containing project.godot\n"); #ifdef TOOLS_ENABLED OS::get_singleton()->print("\t-e,-editor : Bring up the editor instead of running the scene.\n"); #endif @@ -447,6 +447,23 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } else { goto error; } + } else if (I->get().ends_with("project.godot")) { + String path; + String file = I->get(); + int sep = MAX(file.find_last("/"), file.find_last("\\")); + if (sep == -1) + path = "."; + else { + path = file.substr(0, sep); + } + if (OS::get_singleton()->set_cwd(path) == OK) { + // path already specified, don't override + } else { + game_path = path; + } +#ifdef TOOLS_ENABLED + editor = true; +#endif } else if (I->get() == "-bp") { // /breakpoints if (I->next()) { @@ -673,7 +690,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph else input_map->load_from_globals(); //keys for game - if (video_driver == "") // specified in godot.cfg + if (video_driver == "") // specified in project.godot video_driver = GLOBAL_DEF("display/driver/name", Variant((const char *)OS::get_singleton()->get_video_driver_name(0))); if (!force_res && use_custom_res && globals->has("display/window/width")) @@ -725,7 +742,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph /* Determine Video Driver */ - if (audio_driver == "") { // specified in godot.cfg + if (audio_driver == "") { // specified in project.godot audio_driver = GLOBAL_DEF("audio/driver", OS::get_singleton()->get_audio_driver_name(0)); } |