Skip to content

Fix issues when using exception_unhandled_handler #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix issues when using exception_unhandled_handler #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 53 additions & 31 deletions scripts/_GameMaker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ window.yyRequestAnimationFrame =
window.oRequestAnimationFrame ||
window.msRequestAnimationFrame;

window.yyCancelAnimationFrame =
window["cancelAnimationFrame"] ||
window["webkitCancelAnimationFrame"] ||
window["mozCancelAnimationFrame"] ||
window["oCancelAnimationFrame"] ||
window["msCancelAnimationFrame"];

if (!window.yyRequestAnimationFrame) {
// if RAF is somehow amiss but we need short timeouts, register a message handler
// https://dbaron.org/log/20100309-faster-timeouts
Expand Down Expand Up @@ -151,30 +158,41 @@ function exception_unhandled_handler( func )

function yyUnhandledExceptionHandler( event )
{
if ((g_GMLUnhandledExceptionHandler == undefined) || !(g_GMLUnhandledExceptionHandler instanceof Function)) {
var string = "Unhandled Exception - " + event.message + " in file " + event.filename + " at line " + event.lineno ;
print( string );
//alert( string );
game_end(-1);
} // end if
else {
let error = event.error;

// Construct a GML struct to encapsulate the error details.
let errorStruct = { };
errorStruct.__type = "___struct___";
errorStruct.__yyIsGMLObject = true;

// Add error details to the struct with a "gml" prefix for each member.
errorStruct.gmlmessage = error.message;
errorStruct.gmlstacktrace = error.stack;

// Pass the error struct to the custom error handler
var ret = g_GMLUnhandledExceptionHandler( undefined, undefined, errorStruct );
if ((g_GMLUnhandledExceptionHandler == undefined) || !(g_GMLUnhandledExceptionHandler instanceof Function)) {
var string = "Unhandled Exception - " + event.message + " in file " + event.filename + " at line " + event.lineno;
print( string );
//alert( string );
game_end(-1);
} // end if
else {
let errorStruct = event.error;
// Construct a GML struct to encapsulate the error details if we don't have one already.
if (!(errorStruct instanceof YYErrorObject)) {
let message = event.message;
let lineno = event.lineno;
let script = "";
let stacktraceArray = [];
errorStruct = new YYErrorObject(message, message, script, lineno, stacktraceArray);
}
errorStruct.__type = "___struct___";
errorStruct.__yyIsGMLObject = true;

// Pass the error struct to the custom error handler, then
// run it inside a try/catch block, as any exception here would prevent the game from terminating.
let ret = -1;
try {
ret = g_GMLUnhandledExceptionHandler( undefined, undefined, errorStruct );
} catch (_ex) {
console.error("Error while running custom error handler: " + _ex);
}
game_end( ret );
}
debugger;
return false;
}
if (g_StartUpState < 3) {
// Something went wrong before the game reached its final startup state, we must abort *now*.
Run_EndGame(false);
}
debugger;
return false;
}

function yyUnhandledRejectionHandler( error )
Expand Down Expand Up @@ -831,7 +849,7 @@ if( div_a>360 ) div_a-=360;
// #############################################################################################
function animate() {
// once in-game, timing is handled by GameMaker_Tick
if (g_StartUpState != 3) window.requestAnimFrame(animate);
if (g_StartUpState != 3) g_requestAnimationID = window.requestAnimFrame(animate);


if (g_LoadingCanvasCreated) {
Expand Down Expand Up @@ -1592,22 +1610,26 @@ function Run_EndGame(_reset) {
}
g_pInstanceManager.Clear();

// @if feature("audio")
if (_reset) {
// Just stops all audio instances.
// @if feature("audio")
audio_stop_all();
// @endif audio
} else {
// Destroys the AudioContext instance.
// @if feature("audio")
Audio_Quit();
// @endif audio

// Cancels the animation frame request.
if (g_requestAnimationID !== 0 && typeof yyCancelAnimationFrame === "function") {
yyCancelAnimationFrame(g_requestAnimationID);
}
}
// @endif audio
}






// #############################################################################################
/// Function:<summary>
/// Render any system level stuff we need to render.
Expand Down Expand Up @@ -2316,15 +2338,15 @@ function GameMaker_Tick()
// https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#timers
setTimeout(function() {
if (window.yyRequestAnimationFrame) {
window.yyRequestAnimationFrame(animate);
g_requestAnimationID = window.yyRequestAnimationFrame(animate);
} else {
// Don't re-enter, that would be bad.
//animate();
}
}, delay);
} else {
if (window.yyRequestAnimationFrame) {
window.yyRequestAnimationFrame(animate);
g_requestAnimationID = window.yyRequestAnimationFrame(animate);
} else {
window.postMessage("yyRequestAnimationFrame", "*");
}
Expand Down