Skip to content

Commit 09102eb

Browse files
committed
-- using get_res_assemblies_dir() in mono hot reload
-- removed get_res_temp_assemblies_dir() as this is now handled by get_res_assemblies_dir() -- updated verbose printing to be more descriptive of which .NET assemblies dir is being used
1 parent 033f2b6 commit 09102eb

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

modules/mono/csharp_script.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ bool CSharpLanguage::is_assembly_reloading_needed() {
617617
} else {
618618
String assembly_name = path::get_csharp_project_name();
619619

620-
assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir()
620+
assembly_path = GodotSharpDirs::get_res_assemblies_dir()
621621
.path_join(assembly_name + ".dll");
622622
assembly_path = ProjectSettings::get_singleton()->globalize_path(assembly_path);
623623

modules/mono/godotsharp_dirs.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,12 @@ String get_res_metadata_dir() {
232232
return _GodotSharpDirs::get_singleton().res_metadata_dir;
233233
}
234234

235-
String get_res_temp_assemblies_dir() {
236-
return _GodotSharpDirs::get_singleton().res_temp_assemblies_dir;
237-
}
238-
239235
String get_res_assemblies_dir() {
240236
if (!DirAccess::exists(_GodotSharpDirs::get_singleton().packaged_assemblies_dir)) {
241-
print_verbose("using temporary assemblies.");
237+
print_verbose(".NET : using engine temporary assemblies");
242238
return _GodotSharpDirs::get_singleton().res_temp_assemblies_dir;
243239
} else {
244-
print_verbose("using packaged assemblies.");
240+
print_verbose(".NET : using packaged data assemblies");
245241
return _GodotSharpDirs::get_singleton().packaged_assemblies_dir;
246242
}
247243
}

modules/mono/godotsharp_dirs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
namespace GodotSharpDirs {
3737

3838
String get_res_metadata_dir();
39-
String get_res_temp_assemblies_dir();
4039

4140
String get_res_assemblies_dir();
4241
String get_api_assemblies_dir();

0 commit comments

Comments
 (0)