summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM. Kristall <mkpdev@gmail.com>2012-06-25 18:10:53 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:18:16 +0000
commit156289dcdd27a31e77afb36147d456bac9be72a3 (patch)
treede39a7c7d2da3162087515f1ce12d53b3638d4bd
parentd21e89988cfb92272ab6aa133cd32faf7a7cc3a0 (diff)
* Remove now unused join-during-warmup error
-rw-r--r--src/cgame/cg_servercmds.c7
-rw-r--r--src/game/bg_public.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 7d970e5b..e1da8399 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -512,13 +512,6 @@ void CG_Menu( int menu, int arg )
type = DT_COMMAND;
break;
- case MN_WARMUP:
- longMsg = "You must wait until the warmup time is finished "
- "before joining a team. ";
- shortMsg = "You cannot join a team during warmup.";
- type = DT_COMMAND;
- break;
-
//===============================
// Since cheating commands have no default binds, they will often be done
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index dfc1dab7..08436dd0 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -562,7 +562,6 @@ typedef enum
MN_A_TEAMLOCKED,
MN_H_TEAMLOCKED,
MN_PLAYERLIMIT,
- MN_WARMUP,
// cmd stuff
MN_CMD_CHEAT,