Merge remote-tracking branch 'speedprog/banByIp'

[dragonfireclient.git] / src / constants.h

diff --git a/src/constants.h b/src/constants.h
index f90b278d2b25ade145f26c0ce1744e1431a84ec2..14ca58b433d5e13b45e620a81a1a933f24411494 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DEBUGFILE "debug.txt"
 
 #define WATER_ALPHA 160
+//#define WATER_ALPHA 190
 
 // Define for simulating the quirks of sending through internet.
 // Causes the socket class to deliberately drop random packets.
@@ -52,6 +53,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define FOV_ANGLE (PI/2.5)
 
 // The absolute working limit is (2^15 - viewing_range).
+// I really don't want to make every algorithm to check if it's 
+// going near the limit or not, so this is lower.
 #define MAP_GENERATION_LIMIT (31000)
 
 // Size of node in rendering units
@@ -76,21 +79,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // is very low
 #define BLOCK_SEND_DISABLE_LIMITS_MAX_D 1
 
-// The fps limiter will leave this much free time
-//#define FREETIME_RATIO 0.15
-//#define FREETIME_RATIO 0.0
-#define FREETIME_RATIO 0.05
-
 #define PLAYER_INVENTORY_SIZE (8*4)
 
 #define SIGN_TEXT_MAX_LENGTH 50
 
 // Whether to catch all std::exceptions.
 // Assert will be called on such an event.
-#ifdef DEBUG
-       #define CATCH_UNHANDLED_EXCEPTIONS 0
-#else
+// In debug mode, leave these for the debugger and don't catch them.
+#ifdef NDEBUG
        #define CATCH_UNHANDLED_EXCEPTIONS 1
+#else
+       #define CATCH_UNHANDLED_EXCEPTIONS 0
 #endif
 
 /*
@@ -101,12 +100,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 /*
        This is good to be a bit different than 0 so that water level
-       is not between to MapBlocks
+       is not between two MapBlocks
 */
-#define WATER_LEVEL 3
+#define WATER_LEVEL 1
 
 // Length of cracking animation in count of images
 #define CRACK_ANIMATION_LENGTH 5
 
+// Some stuff needed by old code moved to here from heightmap.h
+#define GROUNDHEIGHT_NOTFOUND_SETVALUE (-10e6)
+#define GROUNDHEIGHT_VALID_MINVALUE    ( -9e6)
+
 #endif