From 00dc78cbe9e2120de49f83eb90c33114eae7b7ed Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 8 Dec 2003 22:32:56 +0000 Subject: [PATCH] get rid of silly ulongs --- 2d/ibitblt.c | 20 ++++++++++---------- ChangeLog | 4 ++++ include/maths.h | 2 +- include/ogl_init.h | 2 +- include/pstypes.h | 6 +----- main/game.c | 6 +++--- main/game.h | 6 +++--- unused/bios/ipx.c | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/2d/ibitblt.c b/2d/ibitblt.c index d9f1d4a9..3cf14010 100644 --- a/2d/ibitblt.c +++ b/2d/ibitblt.c @@ -1,4 +1,4 @@ -/* $Id: ibitblt.c,v 1.8 2003-11-07 06:16:15 btb Exp $ */ +/* $Id: ibitblt.c,v 1.9 2003-12-08 22:32:56 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -62,7 +62,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: ibitblt.c,v 1.8 2003-11-07 06:16:15 btb Exp $"; +static char rcsid[] = "$Id: ibitblt.c,v 1.9 2003-12-08 22:32:56 btb Exp $"; #endif #ifdef __MSDOS__ //ndef MACINTOSH @@ -529,7 +529,7 @@ ubyte *gr_ibitblt_create_mask( grs_bitmap * mask_bmp, int sx, int sy, int sw, } #if defined(POLY_ACC) -ulong *pa_emit_blit(int gencode, ulong *buf, int w, int h, int sx, int sy, int dx, int dy) +unsigned long *pa_emit_blit(int gencode, unsigned long *buf, int w, int h, int sx, int sy, int dx, int dy) { if(w == 0 || h == 0) return buf; @@ -545,7 +545,7 @@ ulong *pa_emit_blit(int gencode, ulong *buf, int w, int h, int sx, int sy, int d ubyte *gr_ibitblt_create_mask_pa( grs_bitmap * mask_bmp, int sx, int sy, int sw, int sh, int srowsize ) { - ulong *ret, *code = 0; + unsigned long *ret, *code = 0; int pass, x, y, n; ushort *s; @@ -573,8 +573,8 @@ ubyte *gr_ibitblt_create_mask_pa( grs_bitmap * mask_bmp, int sx, int sy, int s } if(pass == 0) { - ret = malloc((int)code + sizeof(ulong)); - ret[0] = (int)code / sizeof(ulong); // store num ulongs in list. + ret = malloc((int)code + sizeof(unsigned long)); + ret[0] = (int)code / sizeof(unsigned long); // store num unsigned longs in list. code = ret + 1; } } @@ -753,7 +753,7 @@ void gr_ibitblt(grs_bitmap *src_bmp, grs_bitmap *dest_bmp, ubyte pixel_double) #if defined(POLY_ACC) -ulong *pa_emit_blit(int gencode, ulong *buf, int w, int h, int sx, int sy, int dx, int dy) +unsigned long *pa_emit_blit(int gencode, unsigned long *buf, int w, int h, int sx, int sy, int dx, int dy) { if(w == 0 || h == 0) return buf; @@ -769,7 +769,7 @@ ulong *pa_emit_blit(int gencode, ulong *buf, int w, int h, int sx, int sy, int d void gr_ibitblt_create_mask_pa( grs_bitmap * mask_bmp, int sx, int sy, int sw, int sh, int srowsize ) { - ulong *ret, *code = 0; + unsigned long *ret, *code = 0; int pass, x, y, n; ushort *s; @@ -797,8 +797,8 @@ void gr_ibitblt_create_mask_pa( grs_bitmap * mask_bmp, int sx, int sy, int sw, i } if(pass == 0) { - ret = malloc((int)code + sizeof(ulong)); - ret[0] = (int)code / sizeof(ulong); // store num ulongs in list. + ret = malloc((int)code + sizeof(unsigned long)); + ret[0] = (int)code / sizeof(unsigned long); // store num unsigned longs in list. code = ret + 1; } } diff --git a/ChangeLog b/ChangeLog index 2dd6dc5c..aa0b6eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-12-08 Alexander Y. Yeikovich and Bradley Bell + * 2d/ibitblt.c, include/maths.h, include/ogl_init.h, + include/pstypes.h, main/game.c, main/game.h, main, + unused/bios/ipx.c: get rid of silly ulongs + * configure.ac, 2d/bitblt.c, 2d/linear.asm, maths/fix.asm, maths/vecmata.asm, texmap/tmap_inc.asm, texmap/tmap_per.asm, texmap/tmappent.S, texmap/tmapppro.S: enable nasm on FreeBSD, diff --git a/include/maths.h b/include/maths.h index a5b614a5..60a9f7b9 100644 --- a/include/maths.h +++ b/include/maths.h @@ -179,7 +179,7 @@ ushort long_sqrt (int32_t a); //computes the square root of a quadint, returning a long u_int32_t quad_sqrt (u_int32_t low, int32_t high); -//ulong quad_sqrt (long low, long high); +//unsigned long quad_sqrt (long low, long high); //computes the square root of a fix, returning a fix fix fix_sqrt (fix a); diff --git a/include/ogl_init.h b/include/ogl_init.h index bb7d72f3..acdb1a6d 100644 --- a/include/ogl_init.h +++ b/include/ogl_init.h @@ -53,7 +53,7 @@ typedef struct _ogl_texture { GLfloat prio; int wrapstate; fix lastrend; - ulong numrend; + unsigned long numrend; char wantmip; } ogl_texture; diff --git a/include/pstypes.h b/include/pstypes.h index 9100e8b3..f15b7b38 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -1,4 +1,4 @@ -/* $Id: pstypes.h,v 1.24 2003-11-27 04:05:14 btb Exp $ */ +/* $Id: pstypes.h,v 1.25 2003-12-08 22:32:56 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -40,10 +40,6 @@ typedef unsigned char ubyte; #ifndef __unix__ typedef unsigned short ushort; typedef unsigned int uint; -typedef unsigned long ulong; -#endif -#if defined(__APPLE__) && defined(__MACH__) -typedef unsigned long ulong; #endif #ifndef __unix__ diff --git a/main/game.c b/main/game.c index 501fb130..6a3f03b1 100644 --- a/main/game.c +++ b/main/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.24 2003-11-18 00:29:53 btb Exp $ */ +/* $Id: game.c,v 1.25 2003-12-08 22:32:56 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -407,7 +407,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.24 2003-11-18 00:29:53 btb Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.25 2003-12-08 22:32:56 btb Exp $"; #endif #ifdef WINDOWS @@ -3418,7 +3418,7 @@ void enable_flicker(int segnum,int sidenum) #ifdef EDITOR //returns 1 if ok, 0 if error -int add_flicker(int segnum,int sidenum,fix delay,ulong mask) +int add_flicker(int segnum, int sidenum, fix delay, unsigned long mask) { int l; flickering_light *f; diff --git a/main/game.h b/main/game.h index 3a2e6476..0dc150ff 100644 --- a/main/game.h +++ b/main/game.h @@ -1,4 +1,4 @@ -/* $Id: game.h,v 1.5 2003-10-10 09:36:35 btb Exp $ */ +/* $Id: game.h,v 1.6 2003-12-08 22:32:56 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -421,7 +421,7 @@ extern void apply_modified_palette(void); //Flickering light system typedef struct { short segnum, sidenum; - ulong mask; // determines flicker pattern + unsigned long mask; // determines flicker pattern fix timer; // time until next change fix delay; // time between changes } flickering_light; @@ -441,7 +441,7 @@ void disable_flicker(int segnum, int sidenum); void enable_flicker(int segnum, int sidenum); // returns 1 if ok, 0 if error -int add_flicker(int segnum, int sidenum, fix delay, ulong mask); +int add_flicker(int segnum, int sidenum, fix delay, unsigned long mask); int gr_toggle_fullscreen_game(void); diff --git a/unused/bios/ipx.c b/unused/bios/ipx.c index 8b2cf6c9..91b08bad 100644 --- a/unused/bios/ipx.c +++ b/unused/bios/ipx.c @@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #pragma off (unreferenced) -static char rcsid[] = "$Id: ipx.c,v 1.1.1.1 2001-01-19 03:30:14 bradleyb Exp $"; +static char rcsid[] = "$Id: ipx.c,v 1.2 2003-12-08 22:32:56 btb Exp $"; #pragma on (unreferenced) #include @@ -577,7 +577,7 @@ void ipx_read_user_file(char * filename) printf( "Broadcast Users:\n" ); while (fgets(temp_line, 132, fp)) { - ulong net; + unsigned long net; char *np; ln++; p1 = strchr(temp_line,'\n'); if (p1) *p1 = '\0'; @@ -638,7 +638,7 @@ void ipx_read_network_file(char * filename) } while (fgets(temp_line, 132, fp)) { - ulong net; + unsigned long net; ln++; p1 = strchr(temp_line,'\n'); if (p1) *p1 = '\0'; p1 = strchr(temp_line,';'); if (p1) *p1 = '\0'; -- 2.39.2