Merge remote-tracking branch 'queatz/mmb10'

[dragonfireclient.git] / src / constants.h

diff --git a/src/constants.h b/src/constants.h
index 3cb2850659571061f91bcfaf6ddc57d6f904843b..1af5f1f1b2a9e55d4cbe5d1806e11cc6e75fd85f 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 //#define HAXMODE 0
 
-#define APPNAME "minetest"
-
 #define DEBUGFILE "debug.txt"
 
 // Define for simulating the quirks of sending through internet.
@@ -50,6 +48,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
@@ -74,21 +74,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
 
 /*
@@ -99,12 +95,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