From 15e4001bf21c740189ab1ce24427d3fc1a9f65b4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Feb 2000 12:47:23 +0000
Subject: [PATCH] merge qw_client/gl_cl_parse.c and uquake/gl_cl_parse.c into
 common/gl_cl_parse.c

---
 {uquake => common}/gl_cl_parse.c | 14 ++++++++++-
 qw_client/gl_cl_parse.c          | 42 --------------------------------
 2 files changed, 13 insertions(+), 43 deletions(-)
 rename {uquake => common}/gl_cl_parse.c (92%)
 delete mode 100644 qw_client/gl_cl_parse.c

diff --git a/uquake/gl_cl_parse.c b/common/gl_cl_parse.c
similarity index 92%
rename from uquake/gl_cl_parse.c
rename to common/gl_cl_parse.c
index ac531f3..da1b0c5 100644
--- a/uquake/gl_cl_parse.c
+++ b/common/gl_cl_parse.c
@@ -1,5 +1,9 @@
 /*
+gl_cl_parse.c - parse a message received from the server (GL renderer)
 Copyright (C) 1996-1997 Id Software, Inc.
+Portions Copyright (C) 1999,2000  Nelson Rush.
+Copyright (C) 1999,2000  contributors of the QuakeForge project
+Please see the file "AUTHORS" for a list of contributors
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// cl_parse.c  -- parse a message received from the server
 
 #include "quakedef.h"
 #include "glquake.h"
@@ -38,6 +41,7 @@ relinked.  Other attributes can change without relinking.
 */
 int	bitcounts[16];
 
+#ifdef UQUAKE
 void CL_ParseUpdate (int bits)
 {
 	model_t		*model;
@@ -183,6 +187,7 @@ if (bits&(1<<i))
 		ent->forcelink = true;
 	}
 }
+#endif
 /*
 =====================
 CL_NewTranslation
@@ -190,6 +195,12 @@ CL_NewTranslation
 */
 void CL_NewTranslation (int slot)
 {
+#ifdef QUAKEWORLD
+	if (slot > MAX_CLIENTS)
+		Sys_Error ("CL_NewTranslation: slot > MAX_CLIENTS");
+
+	R_TranslatePlayerSkin(slot);
+#else
 	int		i, j;
 	int		top, bottom;
 	byte	*dest, *source;
@@ -217,4 +228,5 @@ void CL_NewTranslation (int slot)
 			for (j=0 ; j<16 ; j++)
 				dest[BOTTOM_RANGE+j] = source[bottom+15-j];		
 	}
+#endif
 }
diff --git a/qw_client/gl_cl_parse.c b/qw_client/gl_cl_parse.c
deleted file mode 100644
index 42d0264..0000000
--- a/qw_client/gl_cl_parse.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-gl_cl_parse.c - parse a message received from the server (GL renderer)
-Copyright (C) 1996-1997 Id Software, Inc.
-Portions Copyright (C) 1999,2000  Nelson Rush.
-Copyright (C) 1999,2000  contributors of the QuakeForge project
-Please see the file "AUTHORS" for a list of contributors
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-#include <quakedef.h>
-#include <model.h>
-#include <pmove.h>
-#include <glquake.h>
-#include <client.h>
-
-/*
-=====================
-CL_NewTranslation
-=====================
-*/
-void CL_NewTranslation (int slot)
-{
-	if (slot > MAX_CLIENTS)
-		Sys_Error ("CL_NewTranslation: slot > MAX_CLIENTS");
-
-	R_TranslatePlayerSkin(slot);
-}