minor fixes to get the non-merged version to build properly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@685 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/client/cl_main.c

@@ -882,7 +882,9 @@ void CL_Disconnect (void)
 #endif
 		SCR_EndLoadingPlaque();
 
+#ifdef Q2CLIENT
 	cls.q2server = 0;
+#endif
 }
 
 #undef serverrunning

engine/client/zqtp.c

@@ -2606,7 +2606,11 @@ static void CL_Say (qboolean team, char *extra)
 		return;
 	}
 #endif
+#ifdef Q2CLIENT
 	MSG_WriteByte (&cls.netchan.message, cls.q2server?clcq2_stringcmd:clc_stringcmd);
+#else
+	MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
+#endif
 	SZ_Print (&cls.netchan.message, team ? "say_team " : "say ");
 
 	if (sendtext[0] < 32)

engine/common/common.c

@@ -883,6 +883,7 @@ static int MSG_ReadRawBits(sizebuf_t *msg, int bits)
 	return bitmask;
 }
 
+#ifndef MINIMAL
 /*
 ============
 MSG_ReadHuffBits
@@ -907,6 +908,7 @@ static int MSG_ReadHuffBits(sizebuf_t *msg, int bits)
 
 	return bitmask;
 }
+#endif
 
 int MSG_ReadBits(int bits)
 {
@@ -937,9 +939,11 @@ int MSG_ReadBits(int bits)
 	case SZ_RAWBITS:
 		bitmask = MSG_ReadRawBits(&net_message, bits);
 		break;
+#ifndef MINIMAL
 	case SZ_HUFFMAN:
 		bitmask = MSG_ReadHuffBits(&net_message, bits);
 		break;
+#endif
 	}
 
 	if (extend)

engine/common/gl_q2bsp.c

@@ -3525,7 +3525,9 @@ void CM_InitBoxHull (void)
 	box_model.funcs.FatPVS				= Q2BSP_FatPVS;
 	box_model.funcs.EdictInFatPVS		= Q2BSP_EdictInFatPVS;
 	box_model.funcs.FindTouchedLeafs_Q1	= Q2BSP_FindTouchedLeafs;
+#ifndef SERVERONLY
 	box_model.funcs.MarkLights			= Q2BSP_MarkLights;
+#endif
 	box_model.funcs.LeafPVS				= CM_LeafnumPVS;
 	box_model.funcs.LeafForPoint		= CM_ModelPointLeafnum;
 

engine/server/sv_phys.c

@@ -331,9 +331,12 @@ int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
 		}
 		else
 		{
-			VectorSubtract(planes[0], trace.plane.normal, diff);
-			if (Length(diff) < 0.01)
-				continue;	//hit this plane already
+			if (numplanes)
+			{
+				VectorSubtract(planes[0], trace.plane.normal, diff);
+				if (Length(diff) < 0.01)
+					continue;	//hit this plane already
+			}
 
 			VectorCopy (trace.plane.normal, planes[numplanes]);
 			numplanes++;

engine/sw/sw_draw.c

@@ -40,7 +40,7 @@ typedef struct {
 static rectdesc_t	r_rectdesc;
 
 qbyte		*draw_chars;				// 8*8 graphic characters
-//mpic_t		*draw_disc;
+mpic_t		*draw_disc;
 mpic_t		*draw_backtile;
 
 void SWDraw_TransPic (int x, int y, mpic_t *pic);