From c68d26ed4f71812cfbd5049af47e7e6e16be12bb Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 10 Oct 2002 18:55:32 +0000 Subject: [PATCH] whitespace --- 2d/circle.c | 18 ++--- 2d/clip.h | 174 ++++++++++++++++++++++++------------------------ 2d/disc.c | 16 ++--- 2d/gpixel.c | 9 ++- 2d/line.c | 41 ++++++------ 2d/pixel.c | 24 +++---- 2d/poly.c | 23 +++---- 2d/rect.c | 4 +- 2d/tmerge.c | 23 ++++--- main/gamerend.c | 10 +-- 10 files changed, 172 insertions(+), 170 deletions(-) diff --git a/2d/circle.c b/2d/circle.c index 77ce4deb..cd7f59d0 100644 --- a/2d/circle.c +++ b/2d/circle.c @@ -1,4 +1,4 @@ -/* $Id: circle.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: circle.c,v 1.4 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -17,7 +17,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: circle.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $"; +static char rcsid[] = "$Id: circle.c,v 1.4 2002-10-10 18:55:32 btb Exp $"; #endif #include "u_mem.h" @@ -52,9 +52,9 @@ int gr_circle(fix xc1,fix yc1,fix r1) gr_pixel( xc-y, yc+x ); gr_pixel( xc+y, yc+x ); - if (p<0) + if (p<0) p=p+(x<<2)+6; - else { + else { // Draw the second octant gr_pixel( xc-x, yc-y ); gr_pixel( xc+x, yc-y ); @@ -65,7 +65,7 @@ int gr_circle(fix xc1,fix yc1,fix r1) } x++; } - if(x==y) { + if(x==y) { gr_pixel( xc-x, yc-y ); gr_pixel( xc+x, yc-y ); gr_pixel( xc-x, yc+y ); @@ -93,9 +93,9 @@ int gr_ucircle(fix xc1,fix yc1,fix r1) gr_upixel( xc-y, yc+x ); gr_upixel( xc+y, yc+x ); - if (p<0) + if (p<0) p=p+(x<<2)+6; - else { + else { // Draw the second octant gr_upixel( xc-x, yc-y ); gr_upixel( xc+x, yc-y ); @@ -106,7 +106,7 @@ int gr_ucircle(fix xc1,fix yc1,fix r1) } x++; } - if(x==y) { + if(x==y) { gr_upixel( xc-x, yc-y ); gr_upixel( xc+x, yc-y ); gr_upixel( xc-x, yc+y ); diff --git a/2d/clip.h b/2d/clip.h index e5069606..59919aa8 100644 --- a/2d/clip.h +++ b/2d/clip.h @@ -1,4 +1,4 @@ -/* $Id: clip.h,v 1.2 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: clip.h,v 1.3 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* @@ -19,35 +19,35 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * * Revision 1.3 1993/10/15 16:22:28 john * *** empty log message *** - * + * * Revision 1.2 1993/09/29 16:14:31 john * made work with fix point - * + * * Revision 1.1 1993/09/08 11:40:53 john * Initial revision - * + * * */ -/*#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +/*#define MIN(a,b) (((a) < (b)) ? (a) : (b)) #define MAX(a,b) (((a) > (b)) ? (a) : (b)) */ #define IABS(x) (((x) < 0) ? -(x) : (x)) #define EXCHG(a,b) do { \ - int __temp__ = (a); \ - (a) = (b); \ - (b) = __temp__; \ + int __temp__ = (a); \ + (a) = (b); \ + (b) = __temp__; \ } while(0) // sort two values #define SORT2(a,b) do { \ - if((a) > (b)) EXCHG(a,b); \ + if((a) > (b)) EXCHG(a,b); \ } while(0) # define SCALE(var,arg,num,den) \ - ((var) = ((arg) * (num)) / (den)) + ((var) = ((arg) * (num)) / (den)) # define USCALE(var,arg,num,den) \ ((var) = ((unsigned)(arg) * (unsigned)(num)) / (unsigned)(den)) @@ -55,99 +55,99 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. # define FSCALE(var,arg,num,den) ((var) = fixmuldiv((arg),(num),(den))) #define CLIPDOT(xx,yy,WHEN_OUTSIDE,WHEN_CLIPPED) { \ - if((xx > XMAX) || (xx < XMIN)) { WHEN_OUTSIDE; } \ - if((yy > YMAX) || (yy < YMIN)) { WHEN_OUTSIDE; } \ + if((xx > XMAX) || (xx < XMIN)) { WHEN_OUTSIDE; } \ + if((yy > YMAX) || (yy < YMIN)) { WHEN_OUTSIDE; } \ } #define CLIPHLINE(x1,x2,yy,WHEN_OUTSIDE,WHEN_CLIPPED) { \ - if(x1 > x2) EXCHG(x1,x2); \ - if((x1 > XMAX) || (x2 < XMIN)) { WHEN_OUTSIDE; } \ - if((yy > YMAX) || (yy < YMIN)) { WHEN_OUTSIDE; } \ - if(x1 < XMIN) { x1 = XMIN; WHEN_CLIPPED; } \ - if(x2 > XMAX) { x2 = XMAX; WHEN_CLIPPED; } \ + if(x1 > x2) EXCHG(x1,x2); \ + if((x1 > XMAX) || (x2 < XMIN)) { WHEN_OUTSIDE; } \ + if((yy > YMAX) || (yy < YMIN)) { WHEN_OUTSIDE; } \ + if(x1 < XMIN) { x1 = XMIN; WHEN_CLIPPED; } \ + if(x2 > XMAX) { x2 = XMAX; WHEN_CLIPPED; } \ } #define CLIPVLINE(xx,y1,y2,WHEN_OUTSIDE,WHEN_CLIPPED) { \ - if(y1 > y2) EXCHG(y1,y2); \ - if((xx > XMAX) || (xx < XMIN)) { WHEN_OUTSIDE; } \ - if((y1 > YMAX) || (y2 < YMIN)) { WHEN_OUTSIDE; } \ - if(y1 < YMIN) { y1 = YMIN; WHEN_CLIPPED; } \ - if(y2 > YMAX) { y2 = YMAX; WHEN_CLIPPED; } \ + if(y1 > y2) EXCHG(y1,y2); \ + if((xx > XMAX) || (xx < XMIN)) { WHEN_OUTSIDE; } \ + if((y1 > YMAX) || (y2 < YMIN)) { WHEN_OUTSIDE; } \ + if(y1 < YMIN) { y1 = YMIN; WHEN_CLIPPED; } \ + if(y2 > YMAX) { y2 = YMAX; WHEN_CLIPPED; } \ } #define CLIPBOX(x1,y1,x2,y2,WHEN_OUTSIDE,WHEN_CLIPPED) { \ - if(x1 > x2) EXCHG(x1,x2); \ - if(y1 > y2) EXCHG(y1,y2); \ - if((x1 > XMAX) || (x2 < 0)) { WHEN_OUTSIDE; } \ - if((y1 > YMAX) || (y2 < 0)) { WHEN_OUTSIDE; } \ - if(x1 < 0) { x1 = 0; WHEN_CLIPPED; } \ - if(y1 < 0) { y1 = 0; WHEN_CLIPPED; } \ - if(x2 > XMAX) { x2 = XMAX; WHEN_CLIPPED; } \ - if(y2 > YMAX) { y2 = YMAX; WHEN_CLIPPED; } \ + if(x1 > x2) EXCHG(x1,x2); \ + if(y1 > y2) EXCHG(y1,y2); \ + if((x1 > XMAX) || (x2 < 0)) { WHEN_OUTSIDE; } \ + if((y1 > YMAX) || (y2 < 0)) { WHEN_OUTSIDE; } \ + if(x1 < 0) { x1 = 0; WHEN_CLIPPED; } \ + if(y1 < 0) { y1 = 0; WHEN_CLIPPED; } \ + if(x2 > XMAX) { x2 = XMAX; WHEN_CLIPPED; } \ + if(y2 > YMAX) { y2 = YMAX; WHEN_CLIPPED; } \ } - + #define CLIPLINE(x1,y1,x2,y2,XMIN,YMIN,XMAX,YMAX,WHEN_OUTSIDE,WHEN_CLIPPED,MY_SCALE) do { \ - register int temp; \ - if(y1 > y2) \ - { EXCHG(y1,y2); EXCHG(x1,x2); } \ - if((y2 < YMIN) || (y1 > YMAX)) \ - { WHEN_OUTSIDE; } \ - if(x1 < x2) { \ - if((x2 < XMIN) || (x1 > XMAX)) { \ - WHEN_OUTSIDE; \ - } \ - if(x1 < XMIN) { \ + register int temp; \ + if(y1 > y2) \ + { EXCHG(y1,y2); EXCHG(x1,x2); } \ + if((y2 < YMIN) || (y1 > YMAX)) \ + { WHEN_OUTSIDE; } \ + if(x1 < x2) { \ + if((x2 < XMIN) || (x1 > XMAX)) { \ + WHEN_OUTSIDE; \ + } \ + if(x1 < XMIN) { \ MY_SCALE(temp,(y2 - y1),(XMIN - x1),(x2 - x1)); \ - if((y1 += temp) > YMAX) { WHEN_OUTSIDE; } \ - x1 = XMIN; \ - WHEN_CLIPPED; \ - } \ - if(x2 > XMAX) { \ + if((y1 += temp) > YMAX) { WHEN_OUTSIDE; } \ + x1 = XMIN; \ + WHEN_CLIPPED; \ + } \ + if(x2 > XMAX) { \ MY_SCALE(temp,(y2 - y1),(x2 - XMAX),(x2 - x1)); \ - if((y2 -= temp) < YMIN) { WHEN_OUTSIDE; } \ - x2 = XMAX; \ - WHEN_CLIPPED; \ - } \ - if(y1 < YMIN) { \ + if((y2 -= temp) < YMIN) { WHEN_OUTSIDE; } \ + x2 = XMAX; \ + WHEN_CLIPPED; \ + } \ + if(y1 < YMIN) { \ MY_SCALE(temp,(x2 - x1),(YMIN - y1),(y2 - y1)); \ - x1 += temp; \ - y1 = YMIN; \ - WHEN_CLIPPED; \ - } \ - if(y2 > YMAX) { \ + x1 += temp; \ + y1 = YMIN; \ + WHEN_CLIPPED; \ + } \ + if(y2 > YMAX) { \ MY_SCALE(temp,(x2 - x1),(y2 - YMAX),(y2 - y1)); \ - x2 -= temp; \ - y2 = YMAX; \ - WHEN_CLIPPED; \ - } \ - } \ - else { \ - if((x1 < XMIN) || (x2 > XMAX)) { \ - WHEN_OUTSIDE; \ - } \ - if(x1 > XMAX) { \ + x2 -= temp; \ + y2 = YMAX; \ + WHEN_CLIPPED; \ + } \ + } \ + else { \ + if((x1 < XMIN) || (x2 > XMAX)) { \ + WHEN_OUTSIDE; \ + } \ + if(x1 > XMAX) { \ MY_SCALE(temp,(y2 - y1),(x1 - XMAX),(x1 - x2)); \ - if((y1 += temp) > YMAX) { WHEN_OUTSIDE; } \ - x1 = XMAX; \ - WHEN_CLIPPED; \ - } \ - if(x2 < XMIN) { \ + if((y1 += temp) > YMAX) { WHEN_OUTSIDE; } \ + x1 = XMAX; \ + WHEN_CLIPPED; \ + } \ + if(x2 < XMIN) { \ MY_SCALE(temp,(y2 - y1),(XMIN - x2),(x1 - x2)); \ - if((y2 -= temp) < YMIN) { WHEN_OUTSIDE; } \ - x2 = XMIN; \ - WHEN_CLIPPED; \ - } \ - if(y1 < YMIN) { \ + if((y2 -= temp) < YMIN) { WHEN_OUTSIDE; } \ + x2 = XMIN; \ + WHEN_CLIPPED; \ + } \ + if(y1 < YMIN) { \ MY_SCALE(temp,(x1 - x2),(YMIN - y1),(y2 - y1)); \ - x1 -= temp; \ - y1 = YMIN; \ - WHEN_CLIPPED; \ - } \ - if(y2 > YMAX) { \ + x1 -= temp; \ + y1 = YMIN; \ + WHEN_CLIPPED; \ + } \ + if(y2 > YMAX) { \ MY_SCALE(temp,(x1 - x2),(y2 - YMAX),(y2 - y1)); \ - x2 += temp; \ - y2 = YMAX; \ - WHEN_CLIPPED; \ - } \ - } \ + x2 += temp; \ + y2 = YMAX; \ + WHEN_CLIPPED; \ + } \ + } \ } while(0) diff --git a/2d/disc.c b/2d/disc.c index a8ae7f93..6638b3d1 100644 --- a/2d/disc.c +++ b/2d/disc.c @@ -1,4 +1,4 @@ -/* $Id: disc.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: disc.c,v 1.4 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -44,9 +44,9 @@ int gr_disk(fix xc1,fix yc1,fix r1) gr_scanline( xc-y, xc+y, yc-x ); gr_scanline( xc-y, xc+y, yc+x ); - if (p<0) + if (p<0) p=p+(x<<2)+6; - else { + else { // Draw the second octant gr_scanline( xc-x, xc+x, yc-y ); gr_scanline( xc-x, xc+x, yc+y ); @@ -55,7 +55,7 @@ int gr_disk(fix xc1,fix yc1,fix r1) } x++; } - if(x==y) { + if(x==y) { gr_scanline( xc-x, xc+x, yc-y ); gr_scanline( xc-x, xc+x, yc+y ); } @@ -79,9 +79,9 @@ int gr_udisk(fix xc1,fix yc1,fix r1) gr_uscanline( xc-y, xc+y, yc-x ); gr_uscanline( xc-y, xc+y, yc+x ); - if (p<0) + if (p<0) p=p+(x<<2)+6; - else { + else { // Draw the second octant gr_uscanline( xc-x, xc+x, yc-y ); gr_uscanline( xc-x, xc+x, yc+y ); @@ -90,7 +90,7 @@ int gr_udisk(fix xc1,fix yc1,fix r1) } x++; } - if(x==y) { + if(x==y) { gr_uscanline( xc-x, xc+x, yc-y ); gr_uscanline( xc-x, xc+x, yc+y ); } diff --git a/2d/gpixel.c b/2d/gpixel.c index 453757e0..92e37aa5 100644 --- a/2d/gpixel.c +++ b/2d/gpixel.c @@ -1,4 +1,4 @@ -/* $Id: gpixel.c,v 1.4 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: gpixel.c,v 1.5 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -34,7 +34,7 @@ unsigned char gr_ugpixel( grs_bitmap * bitmap, int x, int y ) #endif return bitmap->bm_data[ bitmap->bm_rowsize*y + x ]; #ifdef __DJGPP__ - case BM_MODEX: + case BM_MODEX: x += bitmap->bm_x; y += bitmap->bm_y; gr_modex_setplane( x & 3 ); @@ -61,7 +61,7 @@ unsigned char gr_gpixel( grs_bitmap * bitmap, int x, int y ) #endif return bitmap->bm_data[ bitmap->bm_rowsize*y + x ]; #ifdef __DJGPP__ - case BM_MODEX: + case BM_MODEX: x += bitmap->bm_x; y += bitmap->bm_y; gr_modex_setplane( x & 3 ); @@ -77,4 +77,3 @@ unsigned char gr_gpixel( grs_bitmap * bitmap, int x, int y ) return 0; #endif } - diff --git a/2d/line.c b/2d/line.c index 152697e5..3c2382ab 100644 --- a/2d/line.c +++ b/2d/line.c @@ -1,4 +1,4 @@ -/* $Id: line.c,v 1.4 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: line.c,v 1.5 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* @@ -46,14 +46,16 @@ from "Graphics Gems", Academic Press, 1990 /* non-zero flag indicates the pixels needing EXCHG back. */ void plot(int x,int y,int flag) -{ if (flag) +{ + if (flag) gr_upixel(y, x); else gr_upixel(x, y); } int gr_hline(int x1, int x2, int y) -{ int i; +{ + int i; if (x1 > x2) EXCHG(x1,x2); for (i=x1; i<=x2; i++ ) @@ -62,7 +64,8 @@ int gr_hline(int x1, int x2, int y) } int gr_vline(int y1, int y2, int x) -{ int i; +{ + int i; if (y1 > y2) EXCHG(y1,y2); for (i=y1; i<=y2; i++ ) gr_upixel( x, i ); @@ -129,7 +132,7 @@ void gr_universal_uline(int a1, int b1, int a2, int b2) /* In fact (dx-1)/4 as 2 pixels are already plottted */ xend = (dx - 1) / 4; pixels_left = (dx - 1) % 4; /* number of pixels left over at the - * end */ + * end */ plot(x, y, reverse); plot(x1, y1, reverse); /* plot first two points */ incr2 = 4 * dy - 2 * dx; @@ -272,27 +275,27 @@ int gr_uline(fix _a1, fix _b1, fix _a2, fix _b2) switch(TYPE) { #ifdef OGL - case BM_OGL: - ogl_ulinec(a1,b1,a2,b2,COLOR); - return 0; + case BM_OGL: + ogl_ulinec(a1,b1,a2,b2,COLOR); + return 0; #endif case BM_LINEAR: - #ifdef NO_ASM - gr_universal_uline( a1,b1,a2,b2); - #else +#ifdef NO_ASM + gr_universal_uline( a1,b1,a2,b2); +#else gr_linear_line( a1, b1, a2, b2 ); - #endif +#endif return 0; #ifdef __DJGPP__ - case BM_MODEX: - modex_line_x1 = a1+XOFFSET; - modex_line_y1 = b1+YOFFSET; - modex_line_x2 = a2+XOFFSET; - modex_line_y2 = b2+YOFFSET; + case BM_MODEX: + modex_line_x1 = a1+XOFFSET; + modex_line_y1 = b1+YOFFSET; + modex_line_x2 = a2+XOFFSET; + modex_line_y2 = b2+YOFFSET; modex_line_Color = grd_curcanv->cv_color; gr_modex_line(); return 0; - default: + default: gr_universal_uline( a1, b1, a2, b2 ); return 0; #endif diff --git a/2d/pixel.c b/2d/pixel.c index 49259e9f..5271754e 100644 --- a/2d/pixel.c +++ b/2d/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.4 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: pixel.c,v 1.5 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* @@ -38,15 +38,15 @@ void gr_upixel( int x, int y ) switch (TYPE) { #ifdef OGL - case BM_OGL: - ogl_upixelc(x,y,COLOR); - return; + case BM_OGL: + ogl_upixelc(x,y,COLOR); + return; #endif case BM_LINEAR: DATA[ ROWSIZE*y+x ] = COLOR; return; #ifdef __DJGPP__ - case BM_MODEX: + case BM_MODEX: gr_modex_setplane( (x+XOFFSET) & 3 ); gr_video_memory[(ROWSIZE * (y+YOFFSET)) + ((x+XOFFSET)>>2)] = COLOR; return; @@ -54,7 +54,7 @@ void gr_upixel( int x, int y ) gr_vesa_pixel( COLOR, (unsigned int)DATA + (unsigned int)ROWSIZE * y + x); return; #endif - } + } } #endif @@ -70,15 +70,15 @@ inline void gr_bm_upixel( grs_bitmap * bm, int x, int y, unsigned char color ) switch (bm->bm_type) { #ifdef OGL - case BM_OGL: - ogl_upixelc(bm->bm_x+x,bm->bm_y+y,color); - return; + case BM_OGL: + ogl_upixelc(bm->bm_x+x,bm->bm_y+y,color); + return; #endif case BM_LINEAR: bm->bm_data[ bm->bm_rowsize*y+x ] = color; return; #ifdef __DJGPP__ - case BM_MODEX: + case BM_MODEX: x += bm->bm_x; y += bm->bm_y; gr_modex_setplane( x & 3 ); @@ -88,7 +88,7 @@ inline void gr_bm_upixel( grs_bitmap * bm, int x, int y, unsigned char color ) gr_vesa_pixel(color,(unsigned int)bm->bm_data + (unsigned int)bm->bm_rowsize * y + x); return; #endif - } + } } #endif diff --git a/2d/poly.c b/2d/poly.c index c83743be..43c34dff 100644 --- a/2d/poly.c +++ b/2d/poly.c @@ -1,4 +1,4 @@ -/* $Id: poly.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: poly.c,v 1.4 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* @@ -27,14 +27,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //#define USE_POLY_CODE 1 -#define MAX_SCAN_LINES 1200 +#define MAX_SCAN_LINES 1200 -#ifdef USE_POLY_CODE +#ifdef USE_POLY_CODE int y_edge_list[MAX_SCAN_LINES]; void gr_upoly(int nverts, int *vert ) -{ +{ int temp; int startx, stopx; // X coordinates of both ends of current edge. int firstx, firsty; // Saved copy of the first vertex to connect later. @@ -112,7 +112,7 @@ void gr_upoly(int nverts, int *vert ) //gr_uscanline( x2, x1-1, stopy ); gr_uscanline( x2, x1, stopy ); - } else { + } else { dx_dy = (stopx - startx) / (stopy - starty); @@ -207,7 +207,7 @@ void gr_poly(int nverts, int *vert ) } - if (stopy < starty ) { + if (stopy < starty ) { temp = stopy; stopy = starty; starty = temp; @@ -223,7 +223,7 @@ void gr_poly(int nverts, int *vert ) x1 = startx>>16; x2 = stopx>>16; - if (x1 > x2 ) { + if (x1 > x2 ) { temp = x2; x2 = x1; x1 = temp; @@ -237,7 +237,7 @@ void gr_poly(int nverts, int *vert ) gr_scanline( x1, x2, stopy ); } } - } else { + } else { dx_dy = (stopx - startx) / (stopy - starty); @@ -254,11 +254,11 @@ void gr_poly(int nverts, int *vert ) for (; starty < stopy; starty++ ) { if (y_edge_list[starty]==-1) y_edge_list[starty] = startx; - else { + else { x1 = y_edge_list[starty]>>16; x2 = startx>>16; - if (x1 > x2 ) { + if (x1 > x2 ) { temp = x2; x2 = x1; x1 = temp; @@ -281,4 +281,3 @@ void gr_poly(int nverts, int *vert ) } #endif - diff --git a/2d/rect.c b/2d/rect.c index d33cf179..d8859318 100644 --- a/2d/rect.c +++ b/2d/rect.c @@ -1,4 +1,4 @@ -/* $Id: rect.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: rect.c,v 1.4 2002-10-10 18:55:32 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* diff --git a/2d/tmerge.c b/2d/tmerge.c index eac83f69..d10e7fc5 100644 --- a/2d/tmerge.c +++ b/2d/tmerge.c @@ -1,5 +1,6 @@ -/* $Id: tmerge.c,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: tmerge.c,v 1.4 2002-10-10 18:55:32 btb Exp $ */ /* + * * tmerge.c - C Texture merge routines for use with D1X * Ripped from ldescent by * @@ -13,27 +14,27 @@ void gr_merge_textures( ubyte * lower, ubyte * upper, ubyte * dest ) { - int x,y; - ubyte c; - for (y=0;y<64;y++) for (x=0;x<64;x++) { + int x,y; + ubyte c; + for (y=0;y<64;y++) for (x=0;x<64;x++) { c=upper[64*y+x]; if (c==TRANSPARENCY_COLOR) c=lower[64*y+x]; *dest++=c; - } + } } void gr_merge_textures_1( ubyte * lower, ubyte * upper, ubyte * dest ) { - int x,y; - ubyte c; + int x,y; + ubyte c; for (y=0; y<64; y++ ) - for (x=0; x<64; x++ ) { + for (x=0; x<64; x++ ) { c = upper[ 64*x+(63-y) ]; if (c==TRANSPARENCY_COLOR) c = lower[ 64*y+x ]; *dest++ = c; - } + } } void gr_merge_textures_2( ubyte * lower, ubyte * upper, ubyte * dest ) @@ -41,7 +42,7 @@ void gr_merge_textures_2( ubyte * lower, ubyte * upper, ubyte * dest ) int x,y; ubyte c; for (y=0; y<64; y++ ) - for (x=0; x<64; x++ ) { + for (x=0; x<64; x++ ) { c = upper[ 64*(63-y)+(63-x) ]; if (c==TRANSPARENCY_COLOR) c = lower[ 64*y+x ]; @@ -54,7 +55,7 @@ void gr_merge_textures_3( ubyte * lower, ubyte * upper, ubyte * dest ) int x,y; ubyte c; for (y=0; y<64; y++ ) - for (x=0; x<64; x++ ) { + for (x=0; x<64; x++ ) { c = upper[ 64*(63-x)+y ]; if (c==TRANSPARENCY_COLOR) c = lower[ 64*y+x ]; diff --git a/main/gamerend.c b/main/gamerend.c index 8fea3546..4f0b13e5 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -7,7 +7,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamerend.c,v 1.5 2001-10-12 00:18:38 bradleyb Exp $"; +static char rcsid[] = "$Id: gamerend.c,v 1.6 2002-10-10 18:55:32 btb Exp $"; #endif #ifdef WINDOWS @@ -1767,20 +1767,20 @@ void update_cockpits(int force_redraw) WINDOS ( dd_gr_clear_canvas( BM_XRGB(0,0,0) ), gr_clear_canvas( BM_XRGB(0,0,0) ) ); - // In a modex mode, clear the other buffer. + // In a modex mode, clear the other buffer. if (grd_curcanv->cv_bitmap.bm_type == BM_MODEX) { gr_set_current_canvas(&VR_screen_pages[VR_current_page^1]); gr_clear_canvas( BM_XRGB(0,0,0) ); gr_set_current_canvas(&VR_screen_pages[VR_current_page]); } break; - + } WINDOS ( dd_gr_set_current_canvas(&dd_VR_screen_pages[VR_current_page]), gr_set_current_canvas(&VR_screen_pages[VR_current_page]) ); - + if (Cockpit_mode==CM_FULL_COCKPIT || Cockpit_mode==CM_STATUS_BAR) init_gauges(); -- 2.39.2