Merge pull request #76540 from reduz/redo-remote-filesystem

Redo how the remote filesystem works
godotengine · May 8, 2023 · 491a437 · 491a437
2 parents c9f8104 + 273a6ee
commit 491a437
Show file tree

Hide file tree

Showing 22 changed files with 703 additions and 1,028 deletions.
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
@@ -36,7 +36,6 @@
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/file_access_network.h"
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/os/keyboard.h"
@@ -502,17 +501,6 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
 		}
 	}
 
-	// If looking for files in a network client, use it directly
-
-	if (FileAccessNetworkClient::get_singleton()) {
-		Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary");
-		if (err == OK && !p_ignore_override) {
-			// Optional, we don't mind if it fails
-			_load_settings_text("res://override.cfg");
-		}
-		return err;
-	}
-
 	// Attempt with a user-defined main pack first
 
 	if (!p_main_pack.is_empty()) {