summaryrefslogtreecommitdiff
path: root/src/game/bg_misc.c
diff options
context:
space:
mode:
authorM. Kristall <mkpdev@gmail.com>2009-10-03 12:09:04 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:42 +0000
commit18e91721c4bda2513d6a6e890f3538ee97770123 (patch)
tree42498a7b2440dd007ae3d35b611915adce8ebf31 /src/game/bg_misc.c
parent32b40f909ad57f01456cf1dbde5d8653ab329634 (diff)
* Handle some broken admin.dat files the same as before
* Make G_TeamName BG_TeamName and use it in cgame for team change messages * Don't use an event for team change notification since clients already know
Diffstat (limited to 'src/game/bg_misc.c')
-rw-r--r--src/game/bg_misc.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 450844d5..cac8f17b 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -2784,8 +2784,6 @@ char *eventnames[ ] =
"EV_DEATH3",
"EV_OBITUARY",
- "EV_TEAMJOIN", // teamjoin message
-
"EV_GIB_PLAYER", // gib a previously living player
"EV_BUILD_CONSTRUCT",
@@ -3914,3 +3912,19 @@ int BG_LoadEmoticons( char names[ ][ MAX_EMOTICON_NAME_LEN ], int widths[ ] )
return loaded;
}
+/*
+============
+BG_TeamName
+============
+*/
+char *BG_TeamName( team_t team )
+{
+ if( team == TEAM_NONE )
+ return "spectator";
+ if( team == TEAM_ALIENS )
+ return "alien";
+ if( team == TEAM_HUMANS )
+ return "human";
+ return "<team>";
+}
+