LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge in default

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2013-01-27 19:15:55 +01:00
parent c03e35b6cc 4221d55468
commit 0fd4b147a4
26 changed files with 794 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/boot.lua
+8 -3
View File
@@ -694,7 +694,7 @@ end
-- Error screen.
-----------------------------------------------------------
local debug = debug
local debug, print = debug, print
local function error_printer(msg, layer)
print((debug.traceback("Error: " .. tostring(msg), 1+(layer or 1)):gsub("\n[^\n]+$", "")))
@@ -813,6 +813,11 @@ function love.releaseerrhand(msg)
end
end
local function deferErrhand(...)
local handler = ((love._release and love.releaseerrhand) or love.errhand or error_printer)
return handler(...)
end
-----------------------------------------------------------
-- The root of all calls.
@@ -821,9 +826,9 @@ end
return function()
local result = xpcall(love.boot, error_printer)
if not result then return 1 end
local result = xpcall(love.init, love._release and love.releaseerrhand or love.errhand)
local result = xpcall(love.init, deferErrhand)
if not result then return 1 end
local result, retval = xpcall(love.run, love._release and love.releaseerrhand or love.errhand)
local result, retval = xpcall(love.run, deferErrhand)
if not result then return 1 end
return tonumber(retval) or 0