From d3df25bf2124d00685ec542f3ce96b2445688268 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 10 Oct 2002 19:12:00 +0000 Subject: [PATCH] whitespace --- main/hud.c | 17 ++++++++++------- main/netmisc.c | 6 +++--- main/songs.c | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/main/hud.c b/main/hud.c index f8bb915d..3d1c4160 100644 --- a/main/hud.c +++ b/main/hud.c @@ -7,19 +7,22 @@ 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. */ /* * $Source: /cvs/cvsroot/d2x/main/hud.c,v $ - * $Revision: 1.3 $ - * $Author: bradleyb $ - * $Date: 2001-11-04 09:00:25 $ + * $Revision: 1.4 $ + * $Author: btb $ + * $Date: 2002-10-10 19:08:15 $ * * Routines for displaying HUD messages... * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/11/04 09:00:25 bradleyb + * Enable d1x-style hud_message + * * */ @@ -244,7 +247,7 @@ void HUD_render_message_frame() if (grd_curcanv->cv_bitmap.bm_type == BM_MODEX) { - WIN(Int3()); // No no no no .... + WIN(Int3()); // No no no no .... ycrd -= h; h *= 2; modex_hud_message((grd_curcanv->cv_bitmap.bm_w-w)/2, ycrd, message, SMALL_FONT, HUD_color); @@ -312,7 +315,7 @@ void HUD_render_message_frame() } WIN(DDGRUNLOCK(dd_grd_curcanv)); } - } + } #ifndef WINDOWS else if (get_current_game_screen()->cv_bitmap.bm_type == BM_MODEX) { if (Modex_hud_msg_count) { @@ -324,7 +327,7 @@ void HUD_render_message_frame() } #endif - gr_set_curfont( GAME_FONT ); + gr_set_curfont( GAME_FONT ); } int PlayerMessage=1; diff --git a/main/netmisc.c b/main/netmisc.c index 21d3bd83..5ce6f118 100644 --- a/main/netmisc.c +++ b/main/netmisc.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: netmisc.c,v 1.4 2002-08-31 03:21:41 btb Exp $"; +static char rcsid[] = "$Id: netmisc.c,v 1.5 2002-10-10 19:12:00 btb Exp $"; #endif #include @@ -369,7 +369,7 @@ void receive_netgame_packet(ubyte *data, netgame_info *netgame, int lite_flag) memcpy(netgame->game_name, &(data[loc]), NETGAME_NAME_LEN+1); loc += (NETGAME_NAME_LEN+1); memcpy(netgame->mission_title, &(data[loc]), MISSION_NAME_LEN+1); loc += (MISSION_NAME_LEN+1); memcpy(netgame->mission_name, &(data[loc]), 9); loc += 9; - memcpy(&(netgame->levelnum), &(data[loc]), 4); loc += 4; + memcpy(&(netgame->levelnum), &(data[loc]), 4); loc += 4; netgame->levelnum = INTEL_INT(netgame->levelnum); memcpy(&(netgame->gamemode), &(data[loc]), 1); loc++; memcpy(&(netgame->RefusePlayers), &(data[loc]), 1); loc++; diff --git a/main/songs.c b/main/songs.c index cf38c9fb..08ed2736 100644 --- a/main/songs.c +++ b/main/songs.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. */ @@ -302,7 +302,7 @@ void songs_play_level_song( int levelnum ) current_song_level = levelnum; songnum = (levelnum>0)?(levelnum-1):(-levelnum); - + if (!RBAEnabled() && Redbook_enabled && !FindArg("-noredbook")) reinit_redbook(); -- 2.39.2