X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fconstants.h;h=b606fc4fa114282da0894f17f01a075d6bc774db;hb=d4938554818aa71aceb0d360f33c6cfd42f67008;hp=53ef1801eb4687ee8902aecf42eade10a473ac5c;hpb=d4245e6cac58a57ad2498eee2c17e851f3292296;p=minetest.git

diff --git a/src/constants.h b/src/constants.h
index 53ef1801e..b606fc4fa 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define CONNECTION_TIMEOUT 30
 
-#define RESEND_TIMEOUT_MIN 0.333
+#define RESEND_TIMEOUT_MIN 0.1
 #define RESEND_TIMEOUT_MAX 3.0
 // resend_timeout = avg_rtt * this
 #define RESEND_TIMEOUT_FACTOR 4
@@ -64,7 +64,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // 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)
+// This is the maximum value the setting map_generation_limit can be
+#define MAX_MAP_GENERATION_LIMIT (31000)
 
 // Size of node in floating-point units
 // The original idea behind this is to disallow plain casts between
@@ -89,14 +90,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // Maximum hit points of a player
 #define PLAYER_MAX_HP 20
 
+// Maximal breath of a player
+#define PLAYER_MAX_BREATH 11
+
+// Number of different files to try to save a player to if the first fails
+// (because of a case-insensitive filesystem)
+// TODO: Use case-insensitive player names instead of this hack.
+#define PLAYER_FILE_ALTERNATE_TRIES 1000
+
+// For screenshots a serial number is appended to the filename + datetimestamp
+// if filename + datetimestamp is not unique.
+// This is the maximum number of attempts to try and add a serial to the end of
+// the file attempting to ensure a unique filename
+#define SCREENSHOT_MAX_SERIAL_TRIES 1000
+
 /*
- *    GUI related things
- */
-#define LEGACY_SCALING                                     (2./3.)
-#define DEFAULT_FONT_SIZE                  (13.0 / LEGACY_SCALING)
-#define DEFAULT_IMGSIZE                                     (48.0)
-#define DEFAULT_XSPACING                    ((15.0 + (1.0 / 3.0)))
-#define DEFAULT_YSPACING                                     (9.0)
+    GUI related things
+*/
 
+// TODO: implement dpi-based scaling for windows and remove this hack
+#if defined(_WIN32)
+	#define TTF_DEFAULT_FONT_SIZE   (18)
+#else
+	#define TTF_DEFAULT_FONT_SIZE	(15)
 #endif
+#define DEFAULT_FONT_SIZE       (10)
 
+#endif