From 2b77e1ad3bd217ddbd089081462b1cbb8e38e44c Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Mon, 27 Jul 2015 09:00:18 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4950
 fc73d0e0-1445-4013-8a0c-d673dee63da5

---
 engine/server/savegame.c | 2 +-
 engine/server/sv_ccmds.c | 2 +-
 engine/server/sv_user.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engine/server/savegame.c b/engine/server/savegame.c
index eceb0a66e..842ccb5ff 100644
--- a/engine/server/savegame.c
+++ b/engine/server/savegame.c
@@ -1306,7 +1306,7 @@ void SV_Loadgame_f (void)
 		return;
 	}
 
-#ifdef MENU_DAT
+#if defined(MENU_DAT) && !defined(SERVERONLY)
 	MP_Toggle(0);
 #endif
 
diff --git a/engine/server/sv_ccmds.c b/engine/server/sv_ccmds.c
index 99c6b6d2c..abb688e22 100644
--- a/engine/server/sv_ccmds.c
+++ b/engine/server/sv_ccmds.c
@@ -610,7 +610,7 @@ void SV_Map_f (void)
 	}
 #endif
 
-#ifdef MENU_DAT
+#if defined(MENU_DAT) && !defined(SERVERONLY)
 	MP_Toggle(0);
 #endif
 
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index 87d92d2c9..2fccf913c 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -6333,14 +6333,14 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean recurse)
 		{
 			vec3_t diffuse, ambient, dir;
 			float lev = 0;
-#ifdef RTLIGHTS
+#if defined(RTLIGHTS) && !defined(SERVERONLY)
 			Sh_CalcPointLight(sv_player->v->origin, ambient);
 			lev += VectorLength(ambient);
 
 			if (!r_shadow_realtime_world.ival || r_shadow_realtime_world_lightmaps.value)
 #endif
 			{
-				cl.worldmodel->funcs.LightPointValues(cl.worldmodel, sv_player->v->origin, ambient, diffuse, dir);
+				sv.world.worldmodel->funcs.LightPointValues(sv.world.worldmodel, sv_player->v->origin, ambient, diffuse, dir);
 				lev += (VectorLength(ambient) + VectorLength(diffuse)/2.0)/256;
 			}
 			sv_player->xv->light_level = lev * 255;