summaryrefslogtreecommitdiff
path: root/modules/mono
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-11-02 11:06:40 +0100
committerGitHub <noreply@github.com>2018-11-02 11:06:40 +0100
commiteed56bce14b468555804430bde82ac20adf89e6f (patch)
treedadc3fcd550511338fb1c9aa292282a4ff32d1da /modules/mono
parenta33040da4975311f30fc35e5f590ec531ffa04ab (diff)
parent92342690f7bcbd142c876e18f795dc5227e0bb9c (diff)
Merge pull request #23404 from YeldhamDev/gdscript_log_methods
Add new "push_*()" functions to GDScript
Diffstat (limited to 'modules/mono')
-rw-r--r--modules/mono/glue/Managed/Files/GD.cs12
-rw-r--r--modules/mono/glue/gd_glue.cpp8
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/mono/glue/Managed/Files/GD.cs b/modules/mono/glue/Managed/Files/GD.cs
index 8c1a5a6ee8..75a35a9eea 100644
--- a/modules/mono/glue/Managed/Files/GD.cs
+++ b/modules/mono/glue/Managed/Files/GD.cs
@@ -70,14 +70,14 @@ namespace Godot
return ResourceLoader.Load<T>(path);
}
- public static void LogError(string message)
+ public static void PushError(string message)
{
- godot_icall_GD_logerror(message);
+ godot_icall_GD_pusherror(message);
}
- public static void LogWarning(string message)
+ public static void PushWarning(string message)
{
- godot_icall_GD_logwarning(message);
+ godot_icall_GD_pushwarning(message);
}
public static void Print(params object[] what)
@@ -250,9 +250,9 @@ namespace Godot
internal extern static string godot_icall_GD_var2str(object var);
[MethodImpl(MethodImplOptions.InternalCall)]
- internal extern static void godot_icall_GD_logerror(string type);
+ internal extern static void godot_icall_GD_pusherror(string type);
[MethodImpl(MethodImplOptions.InternalCall)]
- internal extern static void godot_icall_GD_logwarning(string type);
+ internal extern static void godot_icall_GD_pushwarning(string type);
}
}
diff --git a/modules/mono/glue/gd_glue.cpp b/modules/mono/glue/gd_glue.cpp
index 6a5430489e..9f5bcecdd9 100644
--- a/modules/mono/glue/gd_glue.cpp
+++ b/modules/mono/glue/gd_glue.cpp
@@ -157,11 +157,11 @@ bool godot_icall_GD_type_exists(MonoString *p_type) {
return ClassDB::class_exists(GDMonoMarshal::mono_string_to_godot(p_type));
}
-void godot_icall_GD_logerror(MonoString *p_str) {
+void godot_icall_GD_pusherror(MonoString *p_str) {
ERR_PRINTS(GDMonoMarshal::mono_string_to_godot(p_str));
}
-void godot_icall_GD_logwarning(MonoString *p_str) {
+void godot_icall_GD_pushwarning(MonoString *p_str) {
WARN_PRINTS(GDMonoMarshal::mono_string_to_godot(p_str));
}
@@ -194,8 +194,8 @@ void godot_register_gd_icalls() {
mono_add_internal_call("Godot.GD::godot_icall_GD_convert", (void *)godot_icall_GD_convert);
mono_add_internal_call("Godot.GD::godot_icall_GD_hash", (void *)godot_icall_GD_hash);
mono_add_internal_call("Godot.GD::godot_icall_GD_instance_from_id", (void *)godot_icall_GD_instance_from_id);
- mono_add_internal_call("Godot.GD::godot_icall_GD_logerror", (void *)godot_icall_GD_logerror);
- mono_add_internal_call("Godot.GD::godot_icall_GD_logwarning", (void *)godot_icall_GD_logwarning);
+ mono_add_internal_call("Godot.GD::godot_icall_GD_pusherror", (void *)godot_icall_GD_pusherror);
+ mono_add_internal_call("Godot.GD::godot_icall_GD_pushwarning", (void *)godot_icall_GD_pushwarning);
mono_add_internal_call("Godot.GD::godot_icall_GD_print", (void *)godot_icall_GD_print);
mono_add_internal_call("Godot.GD::godot_icall_GD_printerr", (void *)godot_icall_GD_printerr);
mono_add_internal_call("Godot.GD::godot_icall_GD_printraw", (void *)godot_icall_GD_printraw);