summaryrefslogtreecommitdiff
path: root/src/cgame/cg_servercmds.c
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-21 07:58:54 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:58 +0000
commitd935b1ba18d3585e468175835693c2a04c23d5a7 (patch)
treedf253c2ad28e26c80aa2f2b90568ae37eb56a096 /src/cgame/cg_servercmds.c
parentc098b029c82b3a3d568feb67c24d11ad47328fd4 (diff)
* Add options in the ingame UI to callvote sudden_death and callvote nextmap (Exclamation)
* Prevent up arrow, down arrow, tab, and mouse buttons from unexpectedly sending Say: menu text * Fix a crash introduced by r1813 when using teamsay on a map without location entities
Diffstat (limited to 'src/cgame/cg_servercmds.c')
-rw-r--r--src/cgame/cg_servercmds.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 6c43782a..0b562360 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -947,7 +947,8 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text )
centity_t *locent;
locent = CG_GetPlayerLocation( );
- locationNum = locent->currentState.generic1;
+ if( locent )
+ locationNum = locent->currentState.generic1;
}
else
locationNum = ci->location;