Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,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());
Expand All @@ -3934,14 +3933,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()) {
Expand Down