Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-12-07 17:56:44 +00:00
19 changed files with 94 additions and 34 deletions

View File

@@ -485,7 +485,7 @@ void Squirrel::Initialize()
/* Handle compile-errors ourself, so we can display it nicely */
sq_setcompilererrorhandler(this->vm, &Squirrel::CompileError);
sq_notifyallexceptions(this->vm, SQTrue);
sq_notifyallexceptions(this->vm, _debug_script_level > 5);
/* Set a good print-function */
sq_setprintfunc(this->vm, &Squirrel::PrintFunc);
/* Handle runtime-errors ourself, so we can display it nicely */