From b42787d07e74e5bfd5b3155cc56f64948b322f31 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 3 Jan 2003 00:57:00 +0000 Subject: [PATCH] formatting --- 3d/interp.c | 5 +++-- include/byteswap.h | 6 +++--- main/gamemine.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/3d/interp.c b/3d/interp.c index 6fed0e85..be948cd2 100644 --- a/3d/interp.c +++ b/3d/interp.c @@ -1,4 +1,4 @@ -/* $Id: interp.c,v 1.10 2003-01-02 23:31:50 btb Exp $ */ +/* $Id: interp.c,v 1.11 2003-01-03 00:57:00 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.10 2003-01-02 23:31:50 btb Exp $"; +static char rcsid[] = "$Id: interp.c,v 1.11 2003-01-03 00:57:00 btb Exp $"; #endif #include @@ -106,6 +106,7 @@ void short_swap(short *s) { *s = SWAPSHORT(*s); } + void fix_swap(fix *f) { *f = (fix)SWAPINT((int)*f); diff --git a/include/byteswap.h b/include/byteswap.h index 18d98c7c..be20429c 100644 --- a/include/byteswap.h +++ b/include/byteswap.h @@ -17,10 +17,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" -#define SWAPSHORT(x) (((ubyte)x << 8) | (((ushort)x) >> 8)) -#define SWAPINT(x) ((x<<24) | (((uint)x) >> 24) | ((x &0x0000ff00) << 8) | ((x & 0x00ff0000) >> 8)) +#define SWAPSHORT(x) (((ubyte)(x) << 8) | (((ushort)(x)) >> 8)) +#define SWAPINT(x) (((x)<<24) | (((uint)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8)) -#ifndef WORDS_BIGENDIAN //MACINTOSH +#ifndef WORDS_BIGENDIAN #define INTEL_INT(x) x #define INTEL_SHORT(x) x #else diff --git a/main/gamemine.c b/main/gamemine.c index 8d2a22c6..faeba560 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamemine.c,v 1.14 2002-12-31 23:20:09 btb Exp $"; +static char rcsid[] = "$Id: gamemine.c,v 1.15 2003-01-03 00:57:00 btb Exp $"; #endif #include @@ -526,7 +526,7 @@ short convert_d1_tmap_num(short d1_tmap_num) { short tmap_num = d1_tmap_num & TMAP_NUM_MASK; short orient = d1_tmap_num & ~TMAP_NUM_MASK; if (orient == 0) { - Warning("convert_d1_tmap_num doesn't know tmap #%d.", tmap_num); + Warning("convert_d1_tmap_num doesn't know tmap #%d.\n", tmap_num); return d1_tmap_num; } else { return orient | convert_d1_tmap_num(tmap_num); -- 2.39.2