asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add print_error function, akin to print_line

Browse source
This commit is contained in:
George Marques 2017-11-14 20:01:45 -02:00
parent b44cb4e3b9
commit 1d12470a78
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
6 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/print_string.cpp
View file

@ -82,7 +82,25 @@ void print_line(String p_string) {
PrintHandlerList *l = print_handler_list;
while (l) {
l->printfunc(l->userdata, p_string);
l->printfunc(l->userdata, p_string, false);
l = l->next;
}
_global_unlock();
}
void print_error(String p_string) {
if (!_print_error_enabled)
return;
OS::get_singleton()->printerr("%s\n", p_string.utf8().get_data());
_global_lock();
PrintHandlerList *l = print_handler_list;
while (l) {
l->printfunc(l->userdata, p_string, true);
l = l->next;
}

3
core/print_string.h
View file

@ -34,7 +34,7 @@
extern void (*_print_func)(String);
typedef void (*PrintHandlerFunc)(void *, const String &p_string);
typedef void (*PrintHandlerFunc)(void *, const String &p_string, bool p_error);
struct PrintHandlerList {
@ -56,5 +56,6 @@ void remove_print_handler(PrintHandlerList *p_handler);
extern bool _print_line_enabled;
extern bool _print_error_enabled;
extern void print_line(String p_string);
extern void print_error(String p_string);
#endif

2
core/script_debugger_remote.cpp
View file

@ -832,7 +832,7 @@ void ScriptDebuggerRemote::send_message(const String &p_message, const Array &p_
mutex->unlock();
}
void ScriptDebuggerRemote::_print_handler(void *p_this, const String &p_string) {
void ScriptDebuggerRemote::_print_handler(void *p_this, const String &p_string, bool p_error) {
ScriptDebuggerRemote *sdr = (ScriptDebuggerRemote *)p_this;

2
core/script_debugger_remote.h
View file

@ -94,7 +94,7 @@ class ScriptDebuggerRemote : public ScriptDebugger {
uint64_t msec_count;
bool locking; //hack to avoid a deadloop
static void _print_handler(void *p_this, const String &p_string);
static void _print_handler(void *p_this, const String &p_string, bool p_error);
PrintHandlerList phl;

2
modules/gdscript/gdscript_functions.cpp
View file

@ -642,7 +642,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
}
//str+="\n";
OS::get_singleton()->printerr("%s\n", str.utf8().get_data());
print_error(str);
r_ret = Variant();
} break;

2
modules/visual_script/visual_script_builtin_funcs.cpp
View file

@ -1109,7 +1109,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
String str = *p_inputs[0];
//str+="\n";
OS::get_singleton()->printerr("%s\n", str.utf8().get_data());
print_error(str);
} break;
case VisualScriptBuiltinFunc::TEXT_PRINTRAW: {