godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some missing renames to 3to4 tool. 

MultiplayerPeerExtension isn't an exact replacement for
NetworkedMultiplayerCustom, but at least it gets you moving in the right direction.

Engine.editor_hint couldn't be fixed by the renames map, because you have to add a `()` at the end.

(cherry picked from commit 6b17c2b6e7)
This commit is contained in:
Ryan Roden-Corrent 2023-03-06 18:16:35 -05:00 committed by Yuri Sizov
parent 06e2c6ace2
commit 81f4996683
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/project_converter_3_to_4.cpp
View File

@ -2268,6 +2268,10 @@ void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContai
if (line.contains("_unhandled_key_input(event: InputEventKey)")) {
line = line.replace("_unhandled_key_input(event: InputEventKey)", "_unhandled_key_input(event: InputEvent)");
}
if (line.contains("Engine.editor_hint")) {
line = line.replace("Engine.editor_hint", "Engine.is_editor_hint()");
}
}
void ProjectConverter3To4::process_csharp_line(String &line, const RegExContainer &reg_container) {

3
editor/renames_map_3_to_4.cpp
View File

@ -1084,6 +1084,7 @@ const char *RenamesMap3To4::gdscript_properties_renames[][2] = {
{ "files_disabled", "file_disabled_color" }, // Theme
{ "folder_icon_modulate", "folder_icon_color" }, // Theme
{ "global_rate_scale", "playback_speed_scale" }, // AudioServer
{ "global_translation", "global_position" }, // Node3D
{ "gravity_distance_scale", "gravity_point_unit_distance" }, // Area(2D/3D)
{ "gravity_vec", "gravity_direction" }, // Area(2D/3D)
{ "hint_tooltip", "tooltip_text" }, // Control
@ -1478,6 +1479,7 @@ const char *RenamesMap3To4::class_renames[][2] = {
{ "CubeMesh", "BoxMesh" },
{ "CylinderShape", "CylinderShape3D" },
{ "DirectionalLight", "DirectionalLight3D" },
{ "Directory", "DirAccess" },
{ "DynamicFont", "FontFile" },
{ "DynamicFontData", "FontFile" },
{ "EditorNavigationMeshGenerator", "NavigationMeshGenerator" },
@ -1520,6 +1522,7 @@ const char *RenamesMap3To4::class_renames[][2] = {
{ "NavigationPolygonInstance", "NavigationRegion2D" },
{ "NavigationRegion", "NavigationRegion3D" },
{ "NavigationServer", "NavigationServer3D" },
{ "NetworkedMultiplayerCustom", "MultiplayerPeerExtension" },
{ "NetworkedMultiplayerENet", "ENetMultiplayerPeer" },
{ "NetworkedMultiplayerPeer", "MultiplayerPeer" },
{ "Occluder", "OccluderInstance3D" },