From 5994795bf0aedbabf443a62fbf079144e5457b53 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 3 Oct 2002 03:46:35 +0000 Subject: [PATCH] whitespace --- 3d/clipper.c | 4 ++-- arch/sdl/mouse.c | 42 ++++++++++++++---------------------------- main/bm.c | 4 ++-- main/game.c | 5 +++-- main/gamecntl.c | 4 ++-- main/newmenu.c | 2 +- main/switch.c | 4 ++-- main/terrain.c | 5 ++--- main/text.c | 8 ++++---- 9 files changed, 32 insertions(+), 46 deletions(-) diff --git a/3d/clipper.c b/3d/clipper.c index e60e947e..d36845e5 100644 --- a/3d/clipper.c +++ b/3d/clipper.c @@ -1,4 +1,4 @@ -/* $Id: clipper.c,v 1.4 2002-07-17 21:55:19 bradleyb Exp $ */ +/* $Id: clipper.c,v 1.5 2002-10-03 03:46:34 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/arch/sdl/mouse.c b/arch/sdl/mouse.c index 5e255011..ddfd584c 100644 --- a/arch/sdl/mouse.c +++ b/arch/sdl/mouse.c @@ -1,21 +1,7 @@ /* - * $Source: /cvs/cvsroot/d2x/arch/sdl/mouse.c,v $ - * $Revision: 1.3 $ - * $Author: bradleyb $ - * $Date: 2001-11-14 11:02:55 $ * * SDL mouse driver. * - * $Log: not supported by cvs2svn $ - * Revision 1.2 2001/11/14 10:44:21 bradleyb - * remove cruft, fix formatting, use mouse wheel to emulate 3rd axis - * - * Revision 1.1 2001/10/24 09:25:05 bradleyb - * Moved input stuff to arch subdirs, as in d1x. - * - * Revision 1.3 2001/01/29 14:03:57 bradleyb - * Fixed build, minor fixes - * */ #ifdef HAVE_CONFIG_H @@ -69,9 +55,9 @@ void mouse_button_handler(SDL_MouseButtonEvent *mbe) MB_HEAD_LEFT, MB_HEAD_RIGHT }; - + int button = button_remap[mbe->button - 1]; // -1 since SDL seems to start counting at 1 - + if (mbe->state == SDL_PRESSED) { Mouse.buttons[button].pressed = 1; Mouse.buttons[button].time_went_down = timer_get_fixed_seconds(); @@ -103,9 +89,9 @@ void mouse_flush() // clears all mice events... { int i; fix current_time; - + event_poll(); - + current_time = timer_get_fixed_seconds(); for (i=0; i=N_polygon_models) Error("Polygon model (%d) out of range in (%s). Range = [0..%d].",i,level_name,N_polygon_models-1); polymodel_read(&Polygon_models[i], fp); - + d_free(Polygon_models[i].model_data); Polygon_models[i].model_data = d_malloc(Polygon_models[i].model_data_size); Assert( Polygon_models[i].model_data != NULL ); diff --git a/main/game.c b/main/game.c index d57521ab..d05e803c 100644 --- a/main/game.c +++ b/main/game.c @@ -1,3 +1,4 @@ +/* $Id: game.c,v 1.16 2002-10-03 03:46:34 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,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-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -16,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.15 2002-09-04 23:05:01 btb Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.16 2002-10-03 03:46:34 btb Exp $"; #endif #ifdef WINDOWS diff --git a/main/gamecntl.c b/main/gamecntl.c index 0fde8029..2c365496 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1,4 +1,4 @@ -/* $Id: gamecntl.c,v 1.12 2002-08-02 11:05:25 btb Exp $ */ +/* $Id: gamecntl.c,v 1.13 2002-10-03 03:46:34 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-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ diff --git a/main/newmenu.c b/main/newmenu.c index 5e5ec552..4d97d021 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -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-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ diff --git a/main/switch.c b/main/switch.c index 7dc7a6ee..38ec07ab 100644 --- a/main/switch.c +++ b/main/switch.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: switch.c,v 1.7 2002-08-06 01:31:07 btb Exp $"; +static char rcsid[] = "$Id: switch.c,v 1.8 2002-10-03 03:46:35 btb Exp $"; #endif #include @@ -471,7 +471,7 @@ int check_trigger_sub(int trigger_num, int pnum,int shot) digi_play_sample( SOUND_BAD_SELECTION, F1_0 ); break; #endif - + if (Newdemo_state == ND_STATE_RECORDING) // stop demo recording Newdemo_state = ND_STATE_PAUSED; diff --git a/main/terrain.c b/main/terrain.c index 707fce93..52ed61ce 100644 --- a/main/terrain.c +++ b/main/terrain.c @@ -1,4 +1,4 @@ -/* $Id: terrain.c,v 1.2 2002-08-02 10:57:12 btb Exp $ */ +/* $Id: terrain.c,v 1.3 2002-10-03 03:46:35 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -79,7 +79,6 @@ int mine_tiles_drawn; //flags to tell if all 4 tiles under mine have drawn void build_light_table(void); void free_light_table(void); - // ------------------------------------------------------------------------ void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_point *p3) { @@ -475,7 +474,7 @@ void build_light_table() if (min_l == max_l) { LIGHT(i,j) = l>>8; continue; - } + } l2 = fixdiv((l-min_l),(max_l-min_l)); diff --git a/main/text.c b/main/text.c index a129b012..6049c95c 100644 --- a/main/text.c +++ b/main/text.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: text.c,v 1.5 2002-07-16 20:47:27 bradleyb Exp $"; +static char rcsid[] = "$Id: text.c,v 1.6 2002-10-03 03:46:35 btb Exp $"; #endif #include @@ -154,11 +154,11 @@ void load_text() strcpy(p+1,p+2); p++; } - + } -// Assert(tptr==text+len || tptr==text+len-2); - + //Assert(tptr==text+len || tptr==text+len-2); + } -- 2.39.2