Browse Source

Clears the scissor in the error screen

bart@bart 16 years ago
parent
commit
4b4cf36579
2 changed files with 68 additions and 66 deletions
  1. 1 0
      src/scripts/boot.lua
  2. 67 66
      src/scripts/boot.lua.h

+ 1 - 0
src/scripts/boot.lua

@@ -639,6 +639,7 @@ function love.errhand(msg)
 	end
 	
 	-- Load.
+	love.graphics.setScissor()
 	love.graphics.setBackgroundColor(89, 157, 220)
 	local font = love.graphics.newFont(love._vera_ttf, 14)
 	love.graphics.setFont(font)

+ 67 - 66
src/scripts/boot.lua.h

@@ -683,77 +683,78 @@ static const unsigned char B1[]={
 110,116, 32,116,104,101,110, 13, 10,  9,  9,114,101,116,117,114,110, 32,101,114,
 114,111,114, 95,112,114,105,110,116,101,114, 40,109,115,103, 41, 13, 10,  9,101,
 110,100, 13, 10,  9, 13, 10,  9, 45, 45, 32, 76,111, 97,100, 46, 13, 10,  9,108,
-111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,115,101,116, 66, 97, 99,107,
-103,114,111,117,110,100, 67,111,108,111,114, 40, 56, 57, 44, 32, 49, 53, 55, 44,
- 32, 50, 50, 48, 41, 13, 10,  9,108,111, 99, 97,108, 32,102,111,110,116, 32, 61,
- 32,108,111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,110,101,119, 70,111,
-110,116, 40,108,111,118,101, 46, 95,118,101,114, 97, 95,116,116,102, 44, 32, 49,
- 52, 41, 13, 10,  9,108,111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,115,
-101,116, 70,111,110,116, 40,102,111,110,116, 41, 13, 10,  9, 13, 10,  9,108,111,
-118,101, 46,103,114, 97,112,104,105, 99,115, 46,115,101,116, 67,111,108,111,114,
- 40, 50, 53, 53, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41,
- 13, 10, 13, 10,  9,108,111, 99, 97,108, 32,116,114, 97, 99,101, 32, 61, 32,100,
-101, 98,117,103, 46,116,114, 97, 99,101, 98, 97, 99,107, 40, 41, 13, 10,  9, 13,
- 10,  9,108,111,118,101, 46,103,114, 97,112,104,105, 99,115, 46, 99,108,101, 97,
-114, 40, 41, 13, 10,  9, 13, 10,  9,108,111, 99, 97,108, 32,101,114,114, 32, 61,
- 32,123,125, 13, 10,  9, 13, 10,  9,116, 97, 98,108,101, 46,105,110,115,101,114,
-116, 40,101,114,114, 44, 32, 34, 69,114,114,111,114, 92,110, 34, 41, 13, 10,  9,
-116, 97, 98,108,101, 46,105,110,115,101,114,116, 40,101,114,114, 44, 32,109,115,
-103, 46, 46, 34, 92,110, 92,110, 34, 41, 13, 10,  9, 13, 10,  9,102,111,114, 32,
-108, 32,105,110, 32,115,116,114,105,110,103, 46,103,109, 97,116, 99,104, 40,116,
-114, 97, 99,101, 44, 32, 34, 40, 46, 45, 41, 92,110, 34, 41, 32,100,111, 13, 10,
-  9,  9,105,102, 32,110,111,116, 32,115,116,114,105,110,103, 46,109, 97,116, 99,
-104, 40,108, 44, 32, 34, 98,111,111,116, 46,108,117, 97, 34, 41, 32,116,104,101,
-110, 13, 10,  9,  9,  9,108, 32, 61, 32,115,116,114,105,110,103, 46,103,115,117,
- 98, 40,108, 44, 32, 34,115,116, 97, 99,107, 32,116,114, 97, 99,101, 98, 97, 99,
-107, 58, 34, 44, 32, 34, 84,114, 97, 99,101, 98, 97, 99,107, 92,110, 34, 41, 13,
- 10,  9,  9,  9,116, 97, 98,108,101, 46,105,110,115,101,114,116, 40,101,114,114,
- 44, 32,108, 41, 13, 10,  9,  9,101,110,100, 13, 10,  9,101,110,100, 13, 10,  9,
- 13, 10,  9,108,111, 99, 97,108, 32,112, 32, 61, 32,116, 97, 98,108,101, 46, 99,
-111,110, 99, 97,116, 40,101,114,114, 44, 32, 34, 92,110, 34, 41, 13, 10,  9,  9,
- 13, 10,  9,112, 32, 61, 32,115,116,114,105,110,103, 46,103,115,117, 98, 40,112,
- 44, 32, 34, 92,116, 34, 44, 32, 34, 34, 41, 13, 10,  9,112, 32, 61, 32,115,116,
-114,105,110,103, 46,103,115,117, 98, 40,112, 44, 32, 34, 37, 91,115,116,114,105,
-110,103, 32, 92, 34, 40, 46, 45, 41, 92, 34, 37, 93, 34, 44, 32, 34, 37, 49, 34,
+111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,115,101,116, 83, 99,105,115,
+115,111,114, 40, 41, 13, 10,  9,108,111,118,101, 46,103,114, 97,112,104,105, 99,
+115, 46,115,101,116, 66, 97, 99,107,103,114,111,117,110,100, 67,111,108,111,114,
+ 40, 56, 57, 44, 32, 49, 53, 55, 44, 32, 50, 50, 48, 41, 13, 10,  9,108,111, 99,
+ 97,108, 32,102,111,110,116, 32, 61, 32,108,111,118,101, 46,103,114, 97,112,104,
+105, 99,115, 46,110,101,119, 70,111,110,116, 40,108,111,118,101, 46, 95,118,101,
+114, 97, 95,116,116,102, 44, 32, 49, 52, 41, 13, 10,  9,108,111,118,101, 46,103,
+114, 97,112,104,105, 99,115, 46,115,101,116, 70,111,110,116, 40,102,111,110,116,
  41, 13, 10,  9, 13, 10,  9,108,111,118,101, 46,103,114, 97,112,104,105, 99,115,
- 46,112,114,105,110,116,102, 40,112, 44, 32, 55, 48, 44, 32, 55, 48, 44, 32,108,
-111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,103,101,116, 87,105,100,116,
-104, 40, 41, 32, 45, 32, 55, 48, 41,  9, 13, 10,  9, 13, 10,  9,108,111,118,101,
- 46,103,114, 97,112,104,105, 99,115, 46,112,114,101,115,101,110,116, 40, 41, 13,
- 10,  9,  9, 13, 10,  9,119,104,105,108,101, 32,116,114,117,101, 32,100,111, 13,
- 10,  9,  9,101, 44, 32, 97, 44, 32, 98, 44, 32, 99, 32, 61, 32,108,111,118,101,
- 46,101,118,101,110,116, 46,119, 97,105,116, 40, 41, 13, 10,  9,  9, 13, 10,  9,
-  9,105,102, 32,101, 32, 61, 61, 32,108,111,118,101, 46,101,118,101,110,116, 95,
-113,117,105,116, 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100,
- 13, 10,  9,  9,105,102, 32,101, 32, 61, 61, 32,108,111,118,101, 46,101,118,101,
-110,116, 95,107,101,121,112,114,101,115,115,101,100, 32, 97,110,100, 32, 97, 32,
- 61, 61, 32,108,111,118,101, 46,107,101,121, 95,101,115, 99, 97,112,101, 32,116,
-104,101,110, 13, 10,  9,  9,  9,114,101,116,117,114,110, 13, 10,  9,  9,101,110,
-100, 13, 10, 13, 10,  9,101,110,100, 13, 10,  9, 13, 10,101,110,100, 13, 10, 13,
- 10, 13, 10, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 46,115,101,116, 67,111,108,111,114, 40, 50, 53, 53, 44, 32, 50, 53, 53, 44, 32,
+ 50, 53, 53, 44, 32, 50, 53, 53, 41, 13, 10, 13, 10,  9,108,111, 99, 97,108, 32,
+116,114, 97, 99,101, 32, 61, 32,100,101, 98,117,103, 46,116,114, 97, 99,101, 98,
+ 97, 99,107, 40, 41, 13, 10,  9, 13, 10,  9,108,111,118,101, 46,103,114, 97,112,
+104,105, 99,115, 46, 99,108,101, 97,114, 40, 41, 13, 10,  9, 13, 10,  9,108,111,
+ 99, 97,108, 32,101,114,114, 32, 61, 32,123,125, 13, 10,  9, 13, 10,  9,116, 97,
+ 98,108,101, 46,105,110,115,101,114,116, 40,101,114,114, 44, 32, 34, 69,114,114,
+111,114, 92,110, 34, 41, 13, 10,  9,116, 97, 98,108,101, 46,105,110,115,101,114,
+116, 40,101,114,114, 44, 32,109,115,103, 46, 46, 34, 92,110, 92,110, 34, 41, 13,
+ 10,  9, 13, 10,  9,102,111,114, 32,108, 32,105,110, 32,115,116,114,105,110,103,
+ 46,103,109, 97,116, 99,104, 40,116,114, 97, 99,101, 44, 32, 34, 40, 46, 45, 41,
+ 92,110, 34, 41, 32,100,111, 13, 10,  9,  9,105,102, 32,110,111,116, 32,115,116,
+114,105,110,103, 46,109, 97,116, 99,104, 40,108, 44, 32, 34, 98,111,111,116, 46,
+108,117, 97, 34, 41, 32,116,104,101,110, 13, 10,  9,  9,  9,108, 32, 61, 32,115,
+116,114,105,110,103, 46,103,115,117, 98, 40,108, 44, 32, 34,115,116, 97, 99,107,
+ 32,116,114, 97, 99,101, 98, 97, 99,107, 58, 34, 44, 32, 34, 84,114, 97, 99,101,
+ 98, 97, 99,107, 92,110, 34, 41, 13, 10,  9,  9,  9,116, 97, 98,108,101, 46,105,
+110,115,101,114,116, 40,101,114,114, 44, 32,108, 41, 13, 10,  9,  9,101,110,100,
+ 13, 10,  9,101,110,100, 13, 10,  9, 13, 10,  9,108,111, 99, 97,108, 32,112, 32,
+ 61, 32,116, 97, 98,108,101, 46, 99,111,110, 99, 97,116, 40,101,114,114, 44, 32,
+ 34, 92,110, 34, 41, 13, 10,  9,  9, 13, 10,  9,112, 32, 61, 32,115,116,114,105,
+110,103, 46,103,115,117, 98, 40,112, 44, 32, 34, 92,116, 34, 44, 32, 34, 34, 41,
+ 13, 10,  9,112, 32, 61, 32,115,116,114,105,110,103, 46,103,115,117, 98, 40,112,
+ 44, 32, 34, 37, 91,115,116,114,105,110,103, 32, 92, 34, 40, 46, 45, 41, 92, 34,
+ 37, 93, 34, 44, 32, 34, 37, 49, 34, 41, 13, 10,  9, 13, 10,  9,108,111,118,101,
+ 46,103,114, 97,112,104,105, 99,115, 46,112,114,105,110,116,102, 40,112, 44, 32,
+ 55, 48, 44, 32, 55, 48, 44, 32,108,111,118,101, 46,103,114, 97,112,104,105, 99,
+115, 46,103,101,116, 87,105,100,116,104, 40, 41, 32, 45, 32, 55, 48, 41,  9, 13,
+ 10,  9, 13, 10,  9,108,111,118,101, 46,103,114, 97,112,104,105, 99,115, 46,112,
+114,101,115,101,110,116, 40, 41, 13, 10,  9,  9, 13, 10,  9,119,104,105,108,101,
+ 32,116,114,117,101, 32,100,111, 13, 10,  9,  9,101, 44, 32, 97, 44, 32, 98, 44,
+ 32, 99, 32, 61, 32,108,111,118,101, 46,101,118,101,110,116, 46,119, 97,105,116,
+ 40, 41, 13, 10,  9,  9, 13, 10,  9,  9,105,102, 32,101, 32, 61, 61, 32,108,111,
+118,101, 46,101,118,101,110,116, 95,113,117,105,116, 32,116,104,101,110, 32,114,
+101,116,117,114,110, 32,101,110,100, 13, 10,  9,  9,105,102, 32,101, 32, 61, 61,
+ 32,108,111,118,101, 46,101,118,101,110,116, 95,107,101,121,112,114,101,115,115,
+101,100, 32, 97,110,100, 32, 97, 32, 61, 61, 32,108,111,118,101, 46,107,101,121,
+ 95,101,115, 99, 97,112,101, 32,116,104,101,110, 13, 10,  9,  9,  9,114,101,116,
+117,114,110, 13, 10,  9,  9,101,110,100, 13, 10, 13, 10,  9,101,110,100, 13, 10,
+  9, 13, 10,101,110,100, 13, 10, 13, 10, 13, 10, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 13, 10, 45, 45, 32, 84,104,101, 32,114,111,111,116, 32,111,102, 32, 97,
-108,108, 32, 99, 97,108,108,115, 46, 13, 10, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 13, 10, 45, 45, 32, 84,104,101, 32,
+114,111,111,116, 32,111,102, 32, 97,108,108, 32, 99, 97,108,108,115, 46, 13, 10,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 13, 10, 13, 10,102,117,110, 99,116,105,
-111,110, 32,101,114,114,111,114, 95,112,114,105,110,116,101,114, 40,109,115,103,
- 41, 13, 10,  9,112,114,105,110,116, 40, 34, 98,111,111,116, 34, 44, 32,109,115,
-103, 44, 32,100,101, 98,117,103, 46,116,114, 97, 99,101, 98, 97, 99,107, 40, 41,
- 41, 13, 10,101,110,100, 13, 10, 13, 10,114,101,115,117,108,116, 32, 61, 32,120,
-112, 99, 97,108,108, 40,108,111,118,101, 46, 98,111,111,116, 44, 32,101,114,114,
-111,114, 95,112,114,105,110,116,101,114, 41, 13, 10,105,102, 32,110,111,116, 32,
-114,101,115,117,108,116, 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,
-110,100, 13, 10,114,101,115,117,108,116, 32, 61, 32,120,112, 99, 97,108,108, 40,
-108,111,118,101, 46,105,110,105,116, 44, 32,108,111,118,101, 46,101,114,114,104,
- 97,110,100, 41, 13, 10,105,102, 32,110,111,116, 32,114,101,115,117,108,116, 32,
-116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100, 13, 10,114,101,115,
-117,108,116, 32, 61, 32,120,112, 99, 97,108,108, 40,108,111,118,101, 46,114,117,
-110, 44, 32,108,111,118,101, 46,101,114,114,104, 97,110,100, 41, 13, 10,105,102,
- 32,110,111,116, 32,114,101,115,117,108,116, 32,116,104,101,110, 32,114,101,116,
-117,114,110, 32,101,110,100, 13, 10, 13, 10,112,114,105,110,116, 40, 34, 68,111,
-110,101, 46, 34, 41, 13, 10,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 13,
+ 10, 13, 10,102,117,110, 99,116,105,111,110, 32,101,114,114,111,114, 95,112,114,
+105,110,116,101,114, 40,109,115,103, 41, 13, 10,  9,112,114,105,110,116, 40, 34,
+ 98,111,111,116, 34, 44, 32,109,115,103, 44, 32,100,101, 98,117,103, 46,116,114,
+ 97, 99,101, 98, 97, 99,107, 40, 41, 41, 13, 10,101,110,100, 13, 10, 13, 10,114,
+101,115,117,108,116, 32, 61, 32,120,112, 99, 97,108,108, 40,108,111,118,101, 46,
+ 98,111,111,116, 44, 32,101,114,114,111,114, 95,112,114,105,110,116,101,114, 41,
+ 13, 10,105,102, 32,110,111,116, 32,114,101,115,117,108,116, 32,116,104,101,110,
+ 32,114,101,116,117,114,110, 32,101,110,100, 13, 10,114,101,115,117,108,116, 32,
+ 61, 32,120,112, 99, 97,108,108, 40,108,111,118,101, 46,105,110,105,116, 44, 32,
+108,111,118,101, 46,101,114,114,104, 97,110,100, 41, 13, 10,105,102, 32,110,111,
+116, 32,114,101,115,117,108,116, 32,116,104,101,110, 32,114,101,116,117,114,110,
+ 32,101,110,100, 13, 10,114,101,115,117,108,116, 32, 61, 32,120,112, 99, 97,108,
+108, 40,108,111,118,101, 46,114,117,110, 44, 32,108,111,118,101, 46,101,114,114,
+104, 97,110,100, 41, 13, 10,105,102, 32,110,111,116, 32,114,101,115,117,108,116,
+ 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100, 13, 10, 13, 10,
+112,114,105,110,116, 40, 34, 68,111,110,101, 46, 34, 41, 13, 10,
 };
 
  if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"boot.lua")==0) lua_pcall(L, 0, 0, 0);