projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged player name and team tree types
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 549d003e45bfda2fda5529629c4535c3ea4e0ef1..090227e8817ee1eeca415152aad9576ffd6869f4 100644
(file)
--- 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_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_BASE_TREE_TYPES 4
-#define NUM_TREE_TYPES
7
+#define NUM_TREE_TYPES
6
#define INFOTEXT_UNDEFINED ""
#define INFOTEXT_GRAPHICS_DIR "Custom Graphics"
#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_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 : \
#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 ? \
(t) == TREE_TYPE_LEVEL_NR ? \
INFOTEXT_LEVEL_NR : \
(t) == TREE_TYPE_LEVEL_DIR ? \