From d218291473a567fad9c90926c4d89c15c4cc36a4 Mon Sep 17 00:00:00 2001 From: vrld Date: Wed, 4 Jan 2012 14:01:14 +0100 Subject: [PATCH] Fix issue #348 - strict mode. Use setCanvas instead of setRenderTarget in love.releaseerrhand. --- src/scripts/boot.lua | 3 ++- src/scripts/boot.lua.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 7ba51de0d..946f57bf5 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -187,6 +187,7 @@ function love.createhandlers() end local is_fused_game = false +local no_game_code = false -- This can't be overriden. function love.boot() @@ -746,7 +747,7 @@ function love.releaseerrhand(msg) return end - love.graphics.setRenderTarget() + love.graphics.setCanvas() love.graphics.setPixelEffect() -- Load. diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 2a622be90..b63a2f2ea 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -317,7 +317,9 @@ const unsigned char boot_lua[] = 0x09, 0x7d, 0x29, 0x0a,0x0a, 0x65, 0x6e, 0x64, 0x0a,0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x73, 0x5f, 0x66, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x67, 0x61, 0x6d, - 0x65, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a,0x0a, + 0x65, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x6f, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, + 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a,0x0a, 0x2d, 0x2d, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x63, 0x61, 0x6e, 0x27, 0x74, 0x20, 0x62, 0x65, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x6e, 0x2e, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x62, 0x6f, 0x6f, 0x74, @@ -1760,7 +1762,7 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a,0x0a, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x74, - 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x28, 0x29, 0x0a, + 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x50, 0x69, 0x78, 0x65, 0x6c, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x28, 0x29, 0x0a,0x0a, 0x09, 0x2d, 0x2d, 0x20, 0x4c, 0x6f, 0x61, 0x64, 0x2e, 0x0a,