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

use console.warn instead of Module.printErr: emscripten no longer exports printErr by default, and instead err() should be used in code seen by the optimizer; however, as Godot only runs on the Web (and not in node.js or elsewhere), using console.warn directly is good enough, and will work in all versions if emscripten

Browse Source
This commit is contained in:
Alon Zakai (kripken) 2018-08-11 09:49:19 -07:00
parent 73cf0fd305
commit 71c03883b5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/javascript/http_request.js
View File

@ -82,7 +82,7 @@ var GodotHTTPRequest = {
godot_xhr_send_string: function(xhrId, strPtr) {
if (!strPtr) {
Module.printErr("Failed to send string per XHR: null pointer");
console.warn("Failed to send string per XHR: null pointer");
return;
}
GodotHTTPRequest.requests[xhrId].send(UTF8ToString(strPtr));
@ -90,11 +90,11 @@ var GodotHTTPRequest = {
godot_xhr_send_data: function(xhrId, ptr, len) {
if (!ptr) {
Module.printErr("Failed to send data per XHR: null pointer");
console.warn("Failed to send data per XHR: null pointer");
return;
}
if (len < 0) {
Module.printErr("Failed to send data per XHR: buffer length less than 0");
console.warn("Failed to send data per XHR: buffer length less than 0");
return;
}
GodotHTTPRequest.requests[xhrId].send(HEAPU8.subarray(ptr, ptr + len));

4
platform/javascript/javascript_eval.cpp
View File

@ -69,7 +69,7 @@ Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) {
eval_ret = eval(UTF8ToString(CODE));
}
} catch (e) {
Module.printErr(e);
console.warn(e);
eval_ret = null;
}
@ -97,7 +97,7 @@ Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) {
if (array_ptr!==0) {
_free(array_ptr)
}
Module.printErr(e);
console.warn(e);
// fall through
}
break;

2
platform/javascript/os_javascript.cpp
View File

@ -788,7 +788,7 @@ bool OS_JavaScript::main_loop_iterate() {
/* clang-format off */
EM_ASM(
FS.syncfs(function(err) {
if (err) { Module.printErr('Failed to save IDB file system: ' + err.message); }
if (err) { console.warn('Failed to save IDB file system: ' + err.message); }
});
);
/* clang-format on */