From: Holger Schemel Date: Mon, 14 Dec 2020 00:53:32 +0000 (+0100) Subject: merged player name and team tree types X-Git-Tag: 4.2.1.0~2 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=94b7c2176cc449da0e0e80a1fb7534cfb5573eba;p=rocksndiamonds.git merged player name and team tree types --- diff --git a/src/libgame/system.h b/src/libgame/system.h index 549d003e..090227e8 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -762,10 +762,9 @@ #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 7 +#define NUM_TREE_TYPES 6 #define INFOTEXT_UNDEFINED "" #define INFOTEXT_GRAPHICS_DIR "Custom Graphics" @@ -773,13 +772,10 @@ #define INFOTEXT_MUSIC_DIR "Custom Music" #define INFOTEXT_LEVEL_DIR "Level Sets" #define INFOTEXT_LEVEL_NR "Levels" -#define INFOTEXT_PLAYER_NAME "Player Names" -#define INFOTEXT_PLAYER_TEAM "Player Teams" +#define INFOTEXT_PLAYER_NAME "Players & 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 ? \ diff --git a/src/screens.c b/src/screens.c index 29ce84dc..ee53e0bf 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4879,9 +4879,7 @@ void DrawChoosePlayerName(void) for (i = 0; i < MAX_PLAYER_NAMES; i++) { - boolean team_mode = (!network.enabled && setup.team_mode); - int tree_type = (team_mode ? TREE_TYPE_PLAYER_TEAM : TREE_TYPE_PLAYER_NAME); - TreeInfo *ti = newTreeInfo_setDefaults(tree_type); + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME); char identifier[32], name[MAX_PLAYER_NAME_LEN + 1]; int value = i;