--- a/hedgewars/uConsts.pas	Thu Dec 18 00:03:53 2014 +0300
+++ b/hedgewars/uConsts.pas	Sat Jan 03 23:46:26 2015 +0300
@@ -36,6 +36,7 @@
     HaltTestSuccess     =  0;
     HaltTestFailed      =  10;
     HaltTestLuaError    =  11;
+    HaltTestUnexpected  =  12;
 
 
     sfMax = 1000;
@@ -48,6 +49,7 @@
     errmsgIncorrectUse    = 'Incorrect use';
     errmsgShouldntRun     = 'This program shouldn''t be run manually';
     errmsgWrongNumber     = 'Wrong parameters number';
+    errmsgLuaTestTerm     = 'WARNING: Lua test terminated before the test was properly finished with EndLuaTest()!';
 
     msgLoading           = 'Loading ';
     msgOK                = 'ok';
@@ -103,9 +105,9 @@
 // To allow these to layer, going to treat them as masks. The bottom byte is reserved for objects
 // TODO - set lfBasic for all solid land, ensure all uses of the flags can handle multiple flag bits
 // lfObject and lfBasic are only to be different *graphically*  in all other ways they should be treated the same
-    lfBasic          = $8000;  // white
+    lfBasic          = $8000;  // black
     lfIndestructible = $4000;  // red
-    lfObject         = $2000;
+    lfObject         = $2000;  // white
     lfDamaged        = $1000;  //
     lfIce            = $0800;  // blue
     lfBouncy         = $0400;  // green
@@ -317,6 +319,7 @@
     kSystemSoundID_Vibrate = $00000FFF;
 
     cMinPlayWidth = 200;
+    cWorldEdgeDist = 200;
 
 implementation