Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112716 from bruvzg/scene_arg

Browse source 
Fix scene argument parsing.
This commit is contained in:
Thaddeus Crews 2025-11-13 12:33:34 -06:00
commit 1f8d114e31
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
main/main.cpp
View file

@ -3920,7 +3920,6 @@ int Main::start() {
return EXIT_FAILURE;
#endif // defined(OVERRIDE_PATH_ENABLED)
} else if (E->get().length() && E->get()[0] != '-' && positional_arg.is_empty() && game_path.is_empty()) {
#if defined(OVERRIDE_PATH_ENABLED)
positional_arg = E->get();
String scene_path = ResourceUID::ensure_path(E->get());
@ -3935,14 +3934,15 @@ int Main::start() {
// or other file extensions without trouble. This can be used to implement
// "drag-and-drop onto executable" logic, which can prove helpful
// for non-game applications.
#if defined(OVERRIDE_PATH_ENABLED)
game_path = scene_path;
}
#else
ERR_PRINT(
"Scene path was specified on the command line, but this Godot binary was compiled without support for path overrides. Aborting.\n"
"To be able to use it, use the `disable_path_overrides=no` SCons option when compiling Godot.\n");
return EXIT_FAILURE;
ERR_PRINT(
"Scene path was specified on the command line, but this Godot binary was compiled without support for path overrides. Aborting.\n"
"To be able to use it, use the `disable_path_overrides=no` SCons option when compiling Godot.\n");
return EXIT_FAILURE;
#endif // defined(OVERRIDE_PATH_ENABLED)
}
}
// Then parameters that have an argument to the right.
else if (E->next()) {