Acorn 3.3

hedge-dev · Sep 16, 2023 · adbfcd6 · adbfcd6
1 parent 59964a7
commit adbfcd6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
@@ -113,7 +113,7 @@ class PackedData {
 	_FORCE_INLINE_ bool is_disabled() const { return disabled; }
 
 	static PackedData *get_singleton() { return singleton; }
-	Error add_pack(const String &p_path, bool p_replace_files, size_t p_offset);
+	Error add_pack(const String &p_path, bool p_replace_files = true, size_t p_offset = 0);
 
 	_FORCE_INLINE_ FileAccess *try_open_path(const String &p_path);
 	_FORCE_INLINE_ bool has_path(const String &p_path);

diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
@@ -188,13 +188,13 @@ Error DirAccess::make_dir_recursive(String p_dir) {
 	return OK;
 }
 
-String DirAccess::get_next(bool *p_is_dir) {
+// String DirAccess::get_next(bool *p_is_dir) {
 
-	String next = get_next();
-	if (p_is_dir)
-		*p_is_dir = current_is_dir();
-	return next;
-}
+// 	String next = get_next();
+// 	if (p_is_dir)
+// 		*p_is_dir = current_is_dir();
+// 	return next;
+// }
 
 String DirAccess::fix_path(String p_path, bool p_make_absolute) const {
 

diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
@@ -377,6 +377,7 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
 
 		return st.st_mtime;
 	} else {
+		return 0;
 		ERR_FAIL_V_MSG(0, "Failed to get modified time for: " + file + ".");
 	}
 }

diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
@@ -2104,8 +2104,8 @@ void ProjectManager::_open_selected_projects() {
 	loading_label->set_modulate(Color(1, 1, 1));
 
 	const Set<String> &selected_list = _project_list->get_selected_project_keys();
-	for (const Map<String, String>::Element *E = selected_list.front(); E; E = E->next()) {
-		const String &selected = E->key();
+	for (const Set<String>::Element *E = selected_list.front(); E; E = E->next()) {
+		const String &selected = E->get();
 
 		bool pckValid = false;
 		String path = EditorSettings::get_singleton()->get("projects/" + selected);
@@ -2179,8 +2179,8 @@ void ProjectManager::_open_selected_projects_ask() {
 	bool pckValid = false;
 
 	// Update the project settings or don't open
-	String path = EditorSettings::get_singleton()->get("projects/" + selected_list.front()->key());
-	String pckPath = EditorSettings::get_singleton()->get("projects-pck/" + selected_list.front()->key(), &pckValid);
+	String path = EditorSettings::get_singleton()->get("projects/" + selected_list.front()->get());
+	String pckPath = EditorSettings::get_singleton()->get("projects-pck/" + selected_list.front()->get(), &pckValid);
 	String conf = path.plus_file("project.godot");
 
 	// FIXME: We already parse those in _load_recent_projects, we could instead make

diff --git a/methods.py b/methods.py
@@ -619,7 +619,7 @@ def find_visual_c_batch_file(env):
     from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file
 
     version = get_default_version(env)
-    (host_platform, target_platform, _) = get_host_target(env)
+    (host_platform, target_platform, _) = get_host_target(env, msvc_version=version)
     return find_batch_file(env, version, host_platform, target_platform)[0]
 
 

diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
@@ -327,15 +327,12 @@ void GeometryInstance::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_cast_character_shadows_setting", "character_shadow_casting_setting"), &GeometryInstance::set_cast_character_shadows_setting);
 	ClassDB::bind_method(D_METHOD("get_cast_character_shadows_setting"), &GeometryInstance::get_cast_character_shadows_setting);
-<<<<<<< HEAD
 
 	ClassDB::bind_method(D_METHOD("set_generate_lightmap", "enabled"), &GeometryInstance::set_generate_lightmap);
 	ClassDB::bind_method(D_METHOD("get_generate_lightmap"), &GeometryInstance::get_generate_lightmap);
 
 	ClassDB::bind_method(D_METHOD("set_lightmap_scale", "scale"), &GeometryInstance::set_lightmap_scale);
 	ClassDB::bind_method(D_METHOD("get_lightmap_scale"), &GeometryInstance::get_lightmap_scale);
-=======
->>>>>>> 1e3e3af24c (Merge pull request #2 from DarioSamo/bse)
 
 	ClassDB::bind_method(D_METHOD("set_lod_max_hysteresis", "mode"), &GeometryInstance::set_lod_max_hysteresis);
 	ClassDB::bind_method(D_METHOD("get_lod_max_hysteresis"), &GeometryInstance::get_lod_max_hysteresis);

diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h
@@ -133,7 +133,6 @@ class GeometryInstance : public VisualInstance {
 
 	void set_cast_character_shadows_setting(ShadowCastingSetting p_shadow_casting_setting);
 	ShadowCastingSetting get_cast_character_shadows_setting() const;
-<<<<<<< HEAD
 
 	void set_bake_cast_shadows(bool p_enabled);
 	bool get_bake_cast_shadows();
@@ -143,8 +142,6 @@ class GeometryInstance : public VisualInstance {
 
 	void set_lightmap_scale(LightmapScale p_scale);
 	LightmapScale get_lightmap_scale() const;
-=======
->>>>>>> 1e3e3af24c (Merge pull request #2 from DarioSamo/bse)
 
 	void set_lod_min_distance(float p_dist);
 	float get_lod_min_distance() const;