Merge pull request #8704 from sheepandshepherd/gdnative_error_printing

Add error printing functions to GDNative
godotengine · May 10, 2017 · 6d0568d · 6d0568d
2 parents 32afcbc + 99e0744
commit 6d0568d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/modules/gdnative/godot.cpp b/modules/gdnative/godot.cpp
@@ -30,6 +30,7 @@
 #include "godot.h"
 
 #include "class_db.h"
+#include "error_macros.h"
 #include "gdnative.h"
 #include "global_config.h"
 #include "global_constants.h"
@@ -215,6 +216,14 @@ void GDAPI godot_free(void *p_ptr) {
 	memfree(p_ptr);
 }
 
+void GDAPI godot_print_error(const char *p_description, const char *p_function, const char *p_file, int p_line) {
+	_err_print_error(p_function, p_file, p_line, p_description, ERR_HANDLER_ERROR);
+}
+
+void GDAPI godot_print_warning(const char *p_description, const char *p_function, const char *p_file, int p_line) {
+	_err_print_error(p_function, p_file, p_line, p_description, ERR_HANDLER_WARNING);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/godot.h b/modules/gdnative/godot.h
@@ -404,6 +404,10 @@ void GDAPI *godot_alloc(int p_bytes);
 void GDAPI *godot_realloc(void *p_ptr, int p_bytes);
 void GDAPI godot_free(void *p_ptr);
 
+//print using Godot's error handler list
+void GDAPI godot_print_error(const char *p_description, const char *p_function, const char *p_file, int p_line);
+void GDAPI godot_print_warning(const char *p_description, const char *p_function, const char *p_file, int p_line);
+
 #ifdef __cplusplus
 }
 #endif