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

Merge pull request #111674 from bruvzg/pck_virt_addr_4

Browse source 
Update embedded PCK virtual address.
This commit is contained in:
Thaddeus Crews 2025-10-28 10:15:35 -05:00
commit 3cd6b3f8c6
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 65 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/config/project_settings.cpp
View file

@ -790,12 +790,14 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
resource_path = current_dir;
resource_path = resource_path.replace_char('\\', '/'); // Windows path to Unix path just in case.
err = _load_settings_text_or_binary(current_dir.path_join("project.godot"), current_dir.path_join("project.binary"));
if (err == OK && !p_ignore_override) {
// Optional, we don't mind if it fails.
if (err == OK) {
#ifdef OVERRIDE_ENABLED
bool disable_override = GLOBAL_GET("application/config/disable_project_settings_override");
if (!disable_override) {
_load_settings_text(current_dir.path_join("override.cfg"));
if (!p_ignore_override) {
// Optional, we don't mind if it fails.
bool disable_override = GLOBAL_GET("application/config/disable_project_settings_override");
if (!disable_override) {
_load_settings_text(current_dir.path_join("override.cfg"));
}
}
#endif // OVERRIDE_ENABLED
found = true;