Index: code/game/g_cmds.c
===================================================================
--- code/game/g_cmds.c	(revision 1858)
+++ code/game/g_cmds.c	(working copy)
@@ -386,14 +386,21 @@
 ==================
 */
 void Cmd_LevelShot_f( gentity_t *ent ) {
+	// Only allow if ent is localhost
+	if (!ent->client->pers.localClient) {
+		trap_SendServerCommand( ent-g_entities,
+			"print \"levelshot command is for local client only\n\"" );
+		return;
+	}
+
 	if ( !CheatsOk( ent ) ) {
 		return;
 	}
 
 	// doesn't work in single player
-	if ( g_gametype.integer != 0 ) {
+	if ( g_gametype.integer == GT_SINGLE_PLAYER ) {
 		trap_SendServerCommand( ent-g_entities, 
-			"print \"Must be in g_gametype 0 for levelshot\n\"" );
+			va("print \"Must be in g_gametype %d for levelshot\n\"", GT_SINGLE_PLAYER) );
 		return;
 	}
 
Index: code/cgame/cg_servercmds.c
===================================================================
--- code/cgame/cg_servercmds.c	(revision 1858)
+++ code/cgame/cg_servercmds.c	(working copy)
@@ -460,6 +460,8 @@
 
 	cg.intermissionStarted = qfalse;
 
+	cg.levelShot = qfalse;
+
 	cgs.voteTime = 0;
 
 	cg.mapRestart = qtrue;