From 96522217565215d20032f176c0762bd6db7bf333 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 13 Feb 2003 22:07:58 +0000
Subject: [PATCH] get rid of some redundant swap functions.  Courtesy of Martin
 Schaffner <martin.schaffner@epfl.ch>

---
 3d/interp.c      | 16 ++++++++++++++--
 include/interp.h |  5 ++++-
 main/polyobj.c   | 35 ++---------------------------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/3d/interp.c b/3d/interp.c
index ff826dcc..82fd5943 100644
--- a/3d/interp.c
+++ b/3d/interp.c
@@ -1,4 +1,4 @@
-/* $Id: interp.c,v 1.12 2003-02-13 22:02:29 btb Exp $ */
+/* $Id: interp.c,v 1.13 2003-02-13 22:07:58 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -40,7 +40,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: interp.c,v 1.12 2003-02-13 22:02:29 btb Exp $";
+static char rcsid[] = "$Id: interp.c,v 1.13 2003-02-13 22:07:58 btb Exp $";
 #endif
 
 #include <stdlib.h>
@@ -119,6 +119,18 @@ void vms_vector_swap(vms_vector *v)
 	fix_swap(fp(&v->z));
 }
 
+void fixang_swap(fixang *f)
+{
+	*f = (fixang)SWAPSHORT((short)*f);
+}
+
+void vms_angvec_swap(vms_angvec *v)
+{
+	fixang_swap(&v->p);
+	fixang_swap(&v->b);
+	fixang_swap(&v->h);
+}
+
 void swap_polygon_model_data(ubyte *data)
 {
 	int i;
diff --git a/include/interp.h b/include/interp.h
index f6d80074..6787bf78 100644
--- a/include/interp.h
+++ b/include/interp.h
@@ -1,4 +1,4 @@
-/* $Id: interp.h,v 1.5 2003-02-13 22:02:29 btb Exp $ */
+/* $Id: interp.h,v 1.6 2003-02-13 22:07:58 btb Exp $ */
 /*
  *
  * took out functions declarations from include/3d.h
@@ -40,6 +40,9 @@ void g3_remap_interp_colors(void);
 #ifdef WORDS_BIGENDIAN
 // routine to convert little to big endian in polygon model data
 void swap_polygon_model_data(ubyte *data);
+//routines to convert little to big endian in vectors
+void vms_vector_swap(vms_vector *v);
+void vms_angvec_swap(vms_angvec *v);
 #endif
 
 #ifdef WORDS_NEED_ALIGNMENT
diff --git a/main/polyobj.c b/main/polyobj.c
index 3629edff..b8f38901 100644
--- a/main/polyobj.c
+++ b/main/polyobj.c
@@ -1,4 +1,4 @@
-/* $Id: polyobj.c,v 1.11 2003-02-13 22:02:29 btb Exp $ */
+/* $Id: polyobj.c,v 1.12 2003-02-13 22:07:58 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: polyobj.c,v 1.11 2003-02-13 22:02:29 btb Exp $";
+static char rcsid[] = "$Id: polyobj.c,v 1.12 2003-02-13 22:07:58 btb Exp $";
 #endif
 
 #include <stdio.h>
@@ -71,37 +71,6 @@ int	Pof_addr;
 
 #define	MODEL_BUF_SIZE	32768
 
-#ifdef WORDS_BIGENDIAN
-void short_swap(short *s)
-{
-	*s = SWAPSHORT(*s);
-}
-
-void fix_swap(fix *f)
-{
-	*f = (fix)SWAPINT((int)*f);
-}
-
-void fixang_swap(fixang *f)
-{
-	*f = (fixang)SWAPSHORT((short)*f);
-}
-
-void vms_vector_swap(vms_vector *v)
-{
-	fix_swap(&v->x);
-	fix_swap(&v->y);
-	fix_swap(&v->z);
-}
-
-void vms_angvec_swap(vms_angvec *v)
-{
-	fixang_swap(&v->p);
-	fixang_swap(&v->b);
-	fixang_swap(&v->h);
-}
-#endif
-
 void _pof_cfseek(int len,int type)
 {
 	switch (type) {
-- 
2.39.2