From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 6 Oct 2020 14:13:19 +0000 (+0000)
Subject: Revert "Eliminate a few client-only files from the dedicated build"
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e703adf309505c85d0814e3a34a4c7c525eb540a;p=xonotic%2Fdarkplaces.git

Revert "Eliminate a few client-only files from the dedicated build"

This reverts commit d79fddea08994064f78b5825a50d578aab756e85.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@13003 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index 379c6ec6..4f1a07e2 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -3703,9 +3703,7 @@ void CL_ParseServerMessage(void)
 					for (i = 1;i < cl.maxclients;i++)
 						cl.entities_active[i] = false;
 				}
-#ifndef SERVERONLY
 				EntityStateQW_ReadPlayerUpdate();
-#endif
 				break;
 
 			case qw_svc_nails:
@@ -3728,9 +3726,7 @@ void CL_ParseServerMessage(void)
 				break;
 
 			case qw_svc_packetentities:
-#ifndef SERVERONLY
 				EntityFrameQW_CL_ReadFrame(false);
-#endif
 				// first update is the final signon stage
 				if (cls.signon == SIGNONS - 1)
 				{
@@ -3740,9 +3736,7 @@ void CL_ParseServerMessage(void)
 				break;
 
 			case qw_svc_deltapacketentities:
-#ifndef SERVERONLY
 				EntityFrameQW_CL_ReadFrame(true);
-#endif
 				// first update is the final signon stage
 				if (cls.signon == SIGNONS - 1)
 				{
@@ -3813,9 +3807,7 @@ void CL_ParseServerMessage(void)
 					cls.signon = SIGNONS;
 					CL_SignonReply ();
 				}
-#ifndef SERVERONLY
 				EntityFrameQuake_ReadEntity (cmd&127);
-#endif
 				continue;
 			}
 
@@ -4216,14 +4208,12 @@ void CL_ParseServerMessage(void)
 					cls.signon = SIGNONS;
 					CL_SignonReply ();
 				}
-#ifndef SERVERONLY
 				if (cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3)
 					EntityFrame_CL_ReadFrame();
 				else if (cls.protocol == PROTOCOL_DARKPLACES4)
 					EntityFrame4_CL_ReadFrame();
 				else
 					EntityFrame5_CL_ReadFrame();
-#endif
 				break;
 			case svc_csqcentities:
 				CSQC_ReadEntities();
@@ -4248,9 +4238,8 @@ void CL_ParseServerMessage(void)
 	if (cls.signon == SIGNONS)
 		CL_UpdateItemsAndWeapon();
 //	R_TimeReport("UpdateItems");
-#ifndef SERVERONLY
+
 	EntityFrameQuake_ISeeDeadEntities();
-#endif
 //	R_TimeReport("ISeeDeadEntities");
 
 	CL_UpdateMoveVars();
diff --git a/makefile.inc b/makefile.inc
index bdf7b808..2fdc966a 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -82,6 +82,11 @@ OBJ_COMMON= \
 	cl_cmd.o \
 	cl_collision.o \
 	cl_demo.o \
+	cl_ents.o \
+	cl_ents4.o \
+	cl_ents5.o \
+	cl_ents_nq.o \
+	cl_ents_qw.o \
 	cl_input.o \
 	cl_main.o \
 	cl_parse.o \
@@ -171,13 +176,6 @@ OBJ_COMMON= \
 	world.o \
 	zone.o
 
-OBJ_CL= \
-	cl_ents.o \
-	cl_ents4.o \
-	cl_ents5.o \
-	cl_ents_qw.o \
-	cl_ents_nq.o
-
 OBJ_MENU= \
 	menu.o \
 	mvm_cmds.o
@@ -204,7 +202,7 @@ endif
 
 CFLAGS_COMMON=$(CFLAGS_STANDARD) $(CFLAGS_TCC) $(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_SND_XMP) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
 CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE)
-CFLAGS_SERVER=-DSERVERONLY
+CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=
@@ -505,7 +503,7 @@ $(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
 	$(CHECKLEVEL2)
 	$(DO_LD)
 
-$(EXE_SDL): $(OBJ_CL) $(OBJ_SDL) $(OBJ_ICON)
+$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
 	$(CHECKLEVEL2)
 	$(DO_LD)
 
@@ -513,7 +511,7 @@ $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
 	$(CHECKLEVEL2)
 	$(DO_LD)
 
-$(EXE_SDLNEXUIZ): $(OBJ_CL) $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
 	$(CHECKLEVEL2)
 	$(DO_LD)