removed redundant code for selecting font color for player name

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 48a03fc1a80e43e8385a2177bb756646ea973571..549d003e45bfda2fda5529629c4535c3ea4e0ef1 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -510,6 +510,9 @@
 // maximum number of parallel players supported by libgame functions
 #define MAX_PLAYERS            4
 
+// maximum number of player names
+#define MAX_PLAYER_NAMES       10
+
 // maximum allowed length of player name
 #define MAX_PLAYER_NAME_LEN    10
 
@@ -646,6 +649,7 @@
 // file names and filename extensions
 #define LEVELSETUP_DIRECTORY   "levelsetup"
 #define SETUP_FILENAME         "setup.conf"
+#define USERSETUP_FILENAME     "usersetup.conf"
 #define AUTOSETUP_FILENAME     "autosetup.conf"
 #define LEVELSETUP_FILENAME    "levelsetup.conf"
 #define EDITORSETUP_FILENAME   "editorsetup.conf"
@@ -757,9 +761,11 @@
 #define TREE_TYPE_MUSIC_DIR    ARTWORK_TYPE_MUSIC
 #define TREE_TYPE_LEVEL_DIR    3
 #define TREE_TYPE_LEVEL_NR     4
+#define TREE_TYPE_PLAYER_NAME  5
+#define TREE_TYPE_PLAYER_TEAM  6
 
 #define NUM_BASE_TREE_TYPES    4
-#define NUM_TREE_TYPES         5
+#define NUM_TREE_TYPES         7
 
 #define INFOTEXT_UNDEFINED     ""
 #define INFOTEXT_GRAPHICS_DIR  "Custom Graphics"
@@ -767,8 +773,14 @@
 #define INFOTEXT_MUSIC_DIR     "Custom Music"
 #define INFOTEXT_LEVEL_DIR     "Level Sets"
 #define INFOTEXT_LEVEL_NR      "Levels"
-
-#define TREE_INFOTEXT(t)       ((t) == TREE_TYPE_LEVEL_NR ?            \
+#define INFOTEXT_PLAYER_NAME   "Player Names"
+#define INFOTEXT_PLAYER_TEAM   "Player Teams"
+
+#define TREE_INFOTEXT(t)       ((t) == TREE_TYPE_PLAYER_NAME ?         \
+                                INFOTEXT_PLAYER_NAME :                 \
+                                (t) == TREE_TYPE_PLAYER_TEAM ?         \
+                                INFOTEXT_PLAYER_TEAM :                 \
+                                (t) == TREE_TYPE_LEVEL_NR ?            \
                                 INFOTEXT_LEVEL_NR :                    \
                                 (t) == TREE_TYPE_LEVEL_DIR ?           \
                                 INFOTEXT_LEVEL_DIR :                   \