revert the directory move

fs2_open/ChangeLog

@@ -1,92 +1,3 @@
-ChangeLog for fs2_open.  All times are UTC.  
-Updated 2002-08-13 04:31
-	
-
-2002-08-13 03:40  penguin
-
-	RELEASED: fs2_open 3.2 (tag: fs2_open3_2)
-
-2002-08-13 03:34  penguin
-
-	* code/freespace2/freespace.cpp (2.6):
-	
-	1. Disable CD checking
-	2. Add CVS tag to version string
-
-2002-08-13 03:32  penguin
-
-	* code/globalincs/version.h (2.2):
-	
-	Bumped to version 3.2
-
-2002-08-07 00:45  DTP
-
-	* code/graphics/grd3drender.cpp (2.3):
-	
-	Implented -GF4FIX commandline switch & #include "cmdline/cmdline.h"
-
-2002-08-07 00:44  DTP
-
-	* code/cmdline/: cmdline.cpp (2.4), cmdline.h (2.3):
-	
-	Implented -GF4FIX commandline switch
-
-2002-08-06 16:50  phreak
-
-	* code/hud/hudtargetbox.cpp (2.2):
-	
-	added wireframe targetbox feature
-
-2002-08-06 16:50  phreak
-
-	* code/hud/hudtargetbox.h (2.1):
-	
-	added Targetbox_wire variable to check what mode the hud targetbox
-	uses
-
-2002-08-06 16:49  phreak
-
-	* code/io/keycontrol.cpp (2.2):
-	
-	added keybing for wireframe hud, fixed previous missile cheat
-
-2002-08-06 04:39  penguin
-
-	* code/hud/hudwingmanstatus.cpp (2.2):
-	
-	Use text strings for wingmen names instead of ANI
-
-2002-08-06 03:50  penguin
-
-	* code/ui/ui.h (2.2):
-	
-	inserted "class" keyword on "friend" definitions (ANSI C++ )
-
-2002-08-06 02:42  penguin
-
-	* Freespace2.dsp (1.7), code/code.dsp (1.6):
-	
-	Fixed problem w/ compile options for Debug mode
-
-2002-08-06 01:49  penguin
-
-	* code/Makefile (2.4):
-	
-	Removed a couple more include dirs I missed
-
-2002-08-06 01:49  penguin
-
-	* code/: globalincs/pstypes.h (2.4), render/3dclipper.cpp (2.2),
-	render/3ddraw.cpp (2.2):
-	
-	Renamed ccode members to cc_or and cc_and
-
-2002-08-04 05:43  penguin
-
-	* ChangeLog (1.1), code/ChangeLog (1.3):
-	
-	Moved ChangeLog to top-level directory
-
 2002-08-04 05:13  penguin
 
 	RELEASED: fs2_open 3.1 (tag: fs2_open3_1)

fs2_open/Freespace2.dsp

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MTd /W4 /Gm /Gi /GX /ZI /Od /I "code" /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "NO_CD_CHECK" /D "USE_DX81" /U "NDEBUG" /Fr /YX /FD /GZ /c
+# ADD CPP /nologo /G5 /MTd /W4 /Gm /Gi /GX /ZI /Od /I "." /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "NO_CD_CHECK" /D "USE_DX81" /U "NDEBUG" /Fr /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

fs2_open/code/Makefile

@@ -91,8 +91,9 @@ LDLIBS = -L/usr/X11R6/lib -lSDL -lGL -lGLU -lpthread
 CXXFLAGS = \
  -g \
  -I/usr/local/include/SDL \
- -I. \
+ -I. -Iwindows_stub \
  -fno-exceptions \
+ -IWeapon -ILocalization -INebula -IDemo -IInetfile -IExceptionHandler \
  -D_DEBUG -DNO_CD_CHECK -UNDEBUG \
  -DNO_DIRECT3D $(SOUND_DEF) $(JOYSTICK_DEF) $(NETWORK_DEF) $(OPENGL_DEF)
 

fs2_open/code/cmdline/cmdline.cpp

@@ -9,14 +9,11 @@
 
 /*
  * $Logfile: /Freespace2/code/Cmdline/cmdline.cpp $
- * $Revision: 2.4 $
- * $Date: 2002-08-07 00:44:13 $
- * $Author: DTP $
+ * $Revision: 2.3 $
+ * $Date: 2002-08-01 01:41:04 $
+ * $Author: penguin $
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
  * Revision 2.2  2002/07/29 06:35:15  DTP
  * added -almission commandline arguement, will autoload mission i.e fs2_open.exe -almission kickass will autoload kickass.fs2 which should be a multiplayer mission.
  *
@@ -254,7 +251,8 @@ cmdline_parm mouse_coords("-coords", NULL);
 cmdline_parm timeout("-timeout", NULL);
 cmdline_parm d3d_window("-window", NULL);
 cmdline_parm almission_arg("-almission", NULL); //DTP for autoload Multi mission
-cmdline_parm gf4fix_arg("-GF4FIX", NULL); //DTP for random tigers GF4fix
+
+
 
 int Cmdline_multi_stream_chat_to_file = 0;
 int Cmdline_freespace_no_sound = 0;
@@ -272,7 +270,7 @@ char *Cmdline_game_password = NULL;
 char *Cmdline_rank_above= NULL;
 char *Cmdline_rank_below = NULL;
 char *Cmdline_connect_addr = NULL;
-char *Cmdline_almission = NULL;	//DTP for autoload multi mission.
+char *Cmdline_almission = NULL;	//DTP FOR AUTO-LOAD Multi MISSION
 int Cmdline_multi_log = 0;
 int Cmdline_server_firing = 0;
 int Cmdline_client_dodamage = 0;
@@ -282,7 +280,6 @@ int Cmdline_mouse_coords = 0;
 int Cmdline_timeout = -1;
 
 int Cmdline_window = 0;
-int Cmdline_gf4fix = 0; // DTP for randomstigers GF4 fix.
 
 static cmdline_parm Parm_list(NULL, NULL);
 static int Parm_list_inited = 0;
@@ -646,8 +643,6 @@ int parse_cmdline(int argc, char *argv[])
 		Cmdline_use_last_pilot = 1;
 		Cmdline_start_netgame = 1;
 	}
-	if (gf4fix_arg.found() ) {
-	Cmdline_gf4fix = 1;
-	}
+
 	return 1;
 }

fs2_open/code/cmdline/cmdline.h

@@ -9,14 +9,11 @@
 
 /*
  * $Logfile: /Freespace2/code/Cmdline/cmdline.h $
- * $Revision: 2.3 $
- * $Date: 2002-08-07 00:44:13 $
+ * $Revision: 2.2 $
+ * $Date: 2002-07-29 06:35:15 $
  * $Author: DTP $
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/07/29 06:35:15  DTP
- * added -almission commandline arguement, will autoload mission i.e fs2_open.exe -almission kickass will autoload kickass.fs2 which should be a multiplayer mission.
- *
  * Revision 2.1  2002/07/07 19:55:58  penguin
  * Back-port to MSVC
  *
@@ -201,7 +198,6 @@ extern int Cmdline_timeout;
 
 extern int Cmdline_window;
 extern char *Cmdline_almission;	//DTP for autoload mission
-extern int Cmdline_gf4fix;	//DTP for Random tigers GF4fix.
 
 
 #endif

fs2_open/code/code.dsp

@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "..\Debug\Profile"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MTd /W4 /Gm /Gi /GX /ZI /Od /I "." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /U "NDEBUG" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /G5 /MTd /W4 /Gm /Gi /GX /ZI /Od /I "." /FI"PSTypes.h" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "USE_DX81" /U "NDEBUG" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

fs2_open/code/freespace2/freespace.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Freespace2/FreeSpace.cpp $
- * $Revision: 2.6 $
- * $Date: 2002-08-13 03:34:00 $
+ * $Revision: 2.5 $
+ * $Date: 2002-08-04 05:11:05 $
  * $Author: penguin $
  *
  * Freespace main body
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.5  2002/08/04 05:11:05  penguin
- * Don't write version to registry; change way version string is formatted
- *
  * Revision 2.4  2002/08/01 01:41:04  penguin
  * The big include file move
  *
@@ -485,8 +482,6 @@
  * 
  */
 
-static const char RCS_Name[] = "$Name: not supported by cvs2svn $";
-
 #include <stdlib.h>
 #include <time.h>
 
@@ -7831,29 +7826,14 @@ void get_version_string(char *str)
 {
 //XSTR:OFF
 if ( FS_VERSION_BUILD == 0 ) {
-	sprintf(str,"V%d.%d", FS_VERSION_MAJOR, FS_VERSION_MINOR);
+	sprintf(str,"fs2_open %d.%d", FS_VERSION_MAJOR, FS_VERSION_MINOR);
 } else {
-	sprintf(str,"V%d.%d.%d", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD );
+	sprintf(str,"fs2_open %d.%d.%d", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD );
 }
 
 #ifdef _DEBUG
 	strcat(str, " Dbg");
 #endif
-
-	// append the CVS "release" version in the $Name variable, but
-	// only do this if it's been tagged
-	int rcs_name_len = strlen(RCS_Name);
-	if (rcs_name_len > 11) {
-		char buffer[100];
-		strcpy(buffer, RCS_Name + 7);
-		buffer[rcs_name_len-9] = 0;
-
-		strcat(str, " Build: ");
-        strcat(str, buffer);
-	} else {
-		strcat(str, " (fs2_open)");
-	}
-
 //XSTR:ON
 	/*
 	HMODULE hMod;
@@ -8627,8 +8607,7 @@ int game_do_cd_check_specific(char *volume_name, int cdnum)
 // only need to do this in RELEASE_REAL
 int game_do_cd_mission_check(char *filename)
 {	
-//#ifdef RELEASE_REAL
-#if 0
+#ifdef RELEASE_REAL
 	int cd_num;
 	int cd_present = 0;
 	int cd_drive_num;

fs2_open/code/globalincs/pstypes.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/GlobalIncs/PsTypes.h $
- * $Revision: 2.4 $
- * $Date: 2002-08-06 01:49:08 $
+ * $Revision: 2.3 $
+ * $Date: 2002-08-01 01:41:04 $
  * $Author: penguin $
  *
  * Header file containg global typedefs, constants and macros
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
  * Revision 2.2  2002/07/22 01:04:37  penguin
  * took out GAME_CD_CHECK define
  *
@@ -272,7 +269,7 @@ typedef unsigned int uint;
 
 //Stucture to store clipping codes in a word
 typedef struct ccodes {
-	ubyte cc_or, cc_and;		//or is low byte, and is high byte
+	ubyte or,and;	//or is low byte, and is high byte
 } ccodes;
 
 typedef struct vector {

fs2_open/code/globalincs/version.h

@@ -9,15 +9,12 @@
 
 /*
  * $Logfile: /Freespace2/code/GlobalIncs/version.h $
- * $Revision: 2.2 $
- * $Date: 2002-08-13 03:32:25 $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-04 05:11:36 $
  * $Author: penguin $
  *
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/04 05:11:36  penguin
- * Update version number to 3.1
- *
  * Revision 2.0  2002/06/03 04:02:22  penguin
  * Warpcore CVS sync
  *
@@ -126,7 +123,7 @@
 //   Major.Minor.Bugfix
 
 #define FS_VERSION_MAJOR 3					// major version
-#define FS_VERSION_MINOR 2					// increase by 1 for minor revs
+#define FS_VERSION_MINOR 1					// increase by 1 for minor revs
 #define FS_VERSION_BUILD 0					// bugfix release
 
 #define VERSION_LOC_FNAME			"version.nfo"

fs2_open/code/graphics/grd3drender.cpp

@@ -9,29 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Graphics/GrD3DRender.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-08-07 00:45:25 $
- * $Author: DTP $
+ * $Revision: 2.2 $
+ * $Date: 2002-08-03 19:42:17 $
+ * $Author: randomtiger $
  *
  * Code to actually render stuff using Direct3D
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/08/03 19:42:17  randomtiger
- * Fixed Geforce 4 bug that caused font and hall video distortion.
- * Very small change in 'gr_d3d_aabitmap_ex_internal'
- *
- * Tested and works on the following systems
- *
- * OUTSIDER Voodoo 3 win98
- * OUTSIDER Geforce 2 win2000
- * Me Geforce 4 PNY 4600 XP
- * JBX-Phoenix Geforce 4 PNY XP
- * Mehrunes GeForce 3 XP
- * WMCoolmon nVidia TNT2 M64 win2000
- * Orange GeForce 4 4200 XP
- * ShadowWolf_IH Monster2 win98
- * ShadowWolf_IH voodoo 2 win98
- *
  * Revision 2.1  2002/08/01 01:41:05  penguin
  * The big include file move
  *
@@ -342,7 +326,6 @@
 #include "cfile/cfile.h"
 #include "nebula/neb.h"
 #include "render/3d.h"
-#include "cmdline/cmdline.h"	//DTP for random tigers GF4fix, and the commandline switch.
 
 typedef enum gr_texture_source {
 	TEXTURE_SOURCE_NONE,
@@ -1506,30 +1489,19 @@ void gr_d3d_aabitmap_ex_internal(int x,int y,int w,int h,int sx,int sy)
 
 	bm_get_info( gr_screen.current_bitmap, &bw, &bh );
 
-	// Rendition 
+	// Rendition
 	if ( D3d_rendition_uvs )	{
 		u0 = u_scale*(i2fl(sx)+0.5f)/i2fl(bw);
 		v0 = v_scale*(i2fl(sy)+0.5f)/i2fl(bh);
 
 		u1 = u_scale*(i2fl(sx+w)+0.5f)/i2fl(bw);
 		v1 = v_scale*(i2fl(sy+h)+0.5f)/i2fl(bh);
-	//} else { //DTP; commented out, for easy re-editing
-	//	u0 = u_scale*i2fl((sx)-0.5f)/i2fl(bw);
-	//	v0 = v_scale*i2fl((sy)-0.5f)/i2fl(bh);
+	} else {
+		u0 = u_scale*i2fl((sx)-0.5f)/i2fl(bw);
+		v0 = v_scale*i2fl((sy)-0.5f)/i2fl(bh);
 
-	//	u1 = u_scale*i2fl((sx+w)-0.5f)/i2fl(bw);
-	//	v1 = v_scale*i2fl((sy+h)-0.5f)/i2fl(bh);
-	//}
-	} else if (!Cmdline_gf4fix) { //DTP if not set at commandline do the original code
-		u0 = u_scale*i2fl(sx)/i2fl(bw);
-		v0 = v_scale*i2fl(sy)/i2fl(bh);
-		u1 = u_scale*i2fl(sx+w)/i2fl(bw);
-		v1 = v_scale*i2fl(sy+h)/i2fl(bh);
-	} else {	//DTP; these next 4 lines is random tigers Fix. activated by setting -GF4FIX in the commandline.
-		u0 = u_scale*(i2fl(sx)-0.5f)/i2fl(bw);
-		v0 = v_scale*(i2fl(sy)-0.5f)/i2fl(bh);
-		u1 = u_scale*(i2fl(sx+w)-0.5f)/i2fl(bw);
-		v1 = v_scale*(i2fl(sy+h)-0.5f)/i2fl(bh);
+		u1 = u_scale*i2fl((sx+w)-0.5f)/i2fl(bw);
+		v1 = v_scale*i2fl((sy+h)-0.5f)/i2fl(bh);
 	}
 
 	x1 = i2fl(x+gr_screen.offset_x);

fs2_open/code/hud/hudtargetbox.cpp

@@ -9,23 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Hud/HUDtargetbox.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 16:50:44 $
- * $Author: phreak $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:06 $
+ * $Author: penguin $
  *
  * C module for drawing the target monitor box on the HUD
  *
  * $Log: not supported by cvs2svn $
- *
- * Revision 2.21 2002/08/04 23:17:40  PhReAk
- * Did the toggling code for wireframes -> CTRL+SHIFT+Q
- *
- * Revision 2.2  2002/08/04 21:53:13  PhReAk
- * Changed hud_render_target_asteroid, ...weapon, ...ship to render in wireframe
- *
- * Revision 2.1  2002/08/01 01:41:06  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:23  penguin
  * Warpcore CVS sync
  *
@@ -378,8 +368,6 @@ int Targetbox_flash_flags;
 // during the game.
 int Targetbox_show_extra_info = 1;
 
-int Targetbox_wire=0;
-
 // Different target states.  This drives the text display right below the hull integrity on the targetbox.
 #define TS_DIS		0
 #define TS_OK		1
@@ -806,14 +794,11 @@ void hud_render_target_asteroid(object *target_objp)
 	float			time_to_impact, factor;	
 	int			subtype;
 
-	int flags=0;									//draw flags for wireframe
 	asteroidp = &Asteroids[target_objp->instance];
 
 	target_team = obj_team(target_objp);
 
 	subtype = asteroidp->asteroid_subtype;
-	
-	time_to_impact = asteroid_time_to_impact(target_objp);
 
 	if ( Detail.targetview_model )	{
 		// take the forward orientation to be the vector from the player to the current target
@@ -832,20 +817,7 @@ void hud_render_target_asteroid(object *target_objp)
 
 		hud_render_target_setup(&camera_eye, &camera_orient, 0.5f);
 		model_clear_instance(Asteroid_info[asteroidp->type].model_num[subtype]);
-		
-		if (Targetbox_wire!=0)
-		{
-			if (time_to_impact>=0)
-				model_set_outline_color(255,255,255);
-			else
-				model_set_outline_color(64,64,0);
-
-			flags = MR_SHOW_OUTLINE;
-			if (Targetbox_wire==1)
-				flags |=MR_NO_POLYS;
-		}
-
-		model_render(Asteroid_info[asteroidp->type].model_num[subtype], &target_objp->orient, &obj_pos, flags |MR_NO_LIGHTING | MR_LOCK_DETAIL );
+		model_render(Asteroid_info[asteroidp->type].model_num[subtype], &target_objp->orient, &obj_pos, MR_NO_LIGHTING | MR_LOCK_DETAIL );
 		hud_render_target_close();
 	}
 
@@ -888,7 +860,7 @@ void hud_render_target_asteroid(object *target_objp)
 
 	emp_hud_printf(Targetbox_coords[gr_screen.res][TBOX_NAME][0], Targetbox_coords[gr_screen.res][TBOX_NAME][1], EG_TBOX_NAME, hud_name);	
 	
-
+	time_to_impact = asteroid_time_to_impact(target_objp);
 	if ( time_to_impact >= 0 ) {
 		emp_hud_printf(Targetbox_coords[gr_screen.res][TBOX_CLASS][0], Targetbox_coords[gr_screen.res][TBOX_CLASS][1], EG_TBOX_CLASS, NOX("impact: %.1f sec"), time_to_impact);	
 	}
@@ -1259,7 +1231,6 @@ void hud_render_target_ship(object *target_objp)
 	target_shipp	= &Ships[target_objp->instance];
 	target_sip		= &Ship_info[target_shipp->ship_info_index];
 
-	int flags=0;
 	if ( Detail.targetview_model )	{
 		// take the forward orientation to be the vector from the player to the current target
 		vm_vec_sub(&orient_vec, &target_objp->pos, &Player_obj->pos);
@@ -1282,41 +1253,11 @@ void hud_render_target_ship(object *target_objp)
 		// model_clear_instance(target_sip->modelnum);
 		ship_model_start( target_objp );
 
-		if (Targetbox_wire!=0)
-		{
-			//set team colors
-			if (target_shipp->team==Player_ship->team)
-			{
-				model_set_outline_color(0,255,0);
-			}
-			else if (((Player_ship->team==TEAM_TRAITOR) && (target_shipp->team==TEAM_FRIENDLY)) ||
-					(target_shipp->team==TEAM_HOSTILE) || (target_shipp->team==TEAM_NEUTRAL))
-			{
-				model_set_outline_color(255,0,0);
-			}
-			else if (target_shipp->team==TEAM_UNKNOWN)
-			{
-				model_set_outline_color(255,0,255);
-			}
-			else
-			{
-				model_set_outline_color(255,255,255);
-			}
-
-			//if a ship is tagged, it overrides team colors
-			if (ship_is_tagged(target_objp))
-			{	
-				model_set_outline_color(255,255,0);
-			}
-			flags = MR_SHOW_OUTLINE;
-			if (Targetbox_wire==1)
-				flags |=MR_NO_POLYS;
-		}
 		// maybe render a special hud-target-only model
 		if(target_sip->modelnum_hud >= 0){
-			model_render( target_sip->modelnum_hud, &target_objp->orient, &obj_pos, flags | MR_NO_LIGHTING | MR_LOCK_DETAIL | MR_AUTOCENTER);
+			model_render( target_sip->modelnum_hud, &target_objp->orient, &obj_pos, MR_NO_LIGHTING | MR_LOCK_DETAIL | MR_AUTOCENTER);
 		} else {
-			model_render( target_sip->modelnum, &target_objp->orient, &obj_pos, flags | MR_NO_LIGHTING | MR_LOCK_DETAIL | MR_AUTOCENTER);
+			model_render( target_sip->modelnum, &target_objp->orient, &obj_pos, MR_NO_LIGHTING | MR_LOCK_DETAIL | MR_AUTOCENTER);
 		}
 		ship_model_stop( target_objp );
 
@@ -1370,7 +1311,6 @@ void hud_render_target_debris(object *target_objp)
 	vector	orient_vec, up_vector;
 	int		target_team, base_index;
 	float		factor;	
-	int flags=0;
 
 	debrisp = &Debris[target_objp->instance];
 
@@ -1393,16 +1333,9 @@ void hud_render_target_debris(object *target_objp)
 		// the objects position
 		vm_vec_copy_scale(&obj_pos,&orient_vec,factor);
 
-		if (Targetbox_wire!=0)
-		{
-			model_set_outline_color(255,255,255);
-			flags = MR_SHOW_OUTLINE;
-			if (Targetbox_wire==1)
-				flags |=MR_NO_POLYS;
-		}
 		hud_render_target_setup(&camera_eye, &camera_orient, 0.5f);
 		model_clear_instance(debrisp->model_num);
-		submodel_render( debrisp->model_num, debrisp->submodel_num, &target_objp->orient, &obj_pos, flags | MR_NO_LIGHTING | MR_LOCK_DETAIL );
+		submodel_render( debrisp->model_num, debrisp->submodel_num, &target_objp->orient, &obj_pos, MR_NO_LIGHTING | MR_LOCK_DETAIL );
 		hud_render_target_close();
 	}
 
@@ -1447,7 +1380,6 @@ void hud_render_target_weapon(object *target_objp)
 	int			target_team, is_homing, is_player_missile, missile_view, viewed_model_num, w, h;
 	float			factor;
 	char			outstr[100];				// temp buffer
-	int flags=0;
 
 	target_team = obj_team(target_objp);
 
@@ -1476,31 +1408,6 @@ void hud_render_target_weapon(object *target_objp)
 			viewed_model_num	= Ships[wp->homing_object->instance].modelnum;
 		}
 
-		if (Targetbox_wire!=0)
-		{
-			if (target_team==Player_ship->team)
-			{
-				model_set_outline_color(0,255,0);
-			}
-			else if (((Player_ship->team==TEAM_TRAITOR) && (target_team==TEAM_FRIENDLY)) ||
-					(target_team==TEAM_HOSTILE) || (target_team==TEAM_NEUTRAL))
-			{
-				model_set_outline_color(128,128,0);
-			}
-			else if (target_team==TEAM_UNKNOWN)
-			{
-				model_set_outline_color(255,0,255);
-			}
-			else
-			{
-				model_set_outline_color(255,255,255);
-			}
-			flags = MR_SHOW_OUTLINE;
-			if (Targetbox_wire==1)
-				flags |=MR_NO_POLYS;
-		}
-			
-
 		// take the forward orientation to be the vector from the player to the current target
 		vm_vec_sub(&orient_vec, &viewed_obj->pos, &viewer_obj->pos);
 		vm_vec_normalize(&orient_vec);
@@ -1520,8 +1427,7 @@ void hud_render_target_weapon(object *target_objp)
 
 		hud_render_target_setup(&camera_eye, &camera_orient, View_zoom/3);
 		model_clear_instance(viewed_model_num);
-
-		model_render( viewed_model_num, &viewed_obj->orient, &obj_pos, flags | MR_NO_LIGHTING | MR_LOCK_DETAIL | MR_AUTOCENTER);		
+		model_render( viewed_model_num, &viewed_obj->orient, &obj_pos, MR_NO_LIGHTING | MR_LOCK_DETAIL );
 		hud_render_target_close();
 	}
 

fs2_open/code/hud/hudtargetbox.h

@@ -9,20 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Hud/HUDtargetbox.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-06 16:50:13 $
- * $Author: phreak $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:23 $
+ * $Author: penguin $
  *
  * Header file for drawing the target monitor box on the HUD
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:23  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2 2002/08/04  22:46:55  PhReAk
- * Added "Targetbox_wire" variable to toggle if wireframes are on=1 or off=0
- *
- *
  * Revision 1.1  2002/05/02 18:03:08  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -152,9 +145,6 @@ extern int Target_window_coords[GR_NUM_RESOLUTIONS][4];
 // during the game.
 extern int Targetbox_show_extra_info;
 
-//used to track if the player has wireframe hud target box turned on
-extern int Targetbox_wire;
-
 void	hud_targetbox_init();
 void	hud_targetbox_init_flash();
 void	hud_render_target_model();

fs2_open/code/hud/hudwingmanstatus.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Hud/HUDWingmanStatus.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 04:39:26 $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:06 $
  * $Author: penguin $
  *
  * Module for the wingman status gauge
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/01 01:41:06  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:23  penguin
  * Warpcore CVS sync
  *
@@ -175,13 +172,6 @@ static int HUD_wingman_flash_duration[HUD_WINGMAN_MAX_WINGS][HUD_WINGMAN_MAX_SHI
 static int HUD_wingman_flash_next[HUD_WINGMAN_MAX_WINGS][HUD_WINGMAN_MAX_SHIPS_PER_WINGS];
 static int HUD_wingman_flash_is_bright;
 
-
-//XSTR:OFF
-// Text versions of wingman names (instead of bitmaps in winman5.ani)
-static char *Wingman_status_name_abbr[6] = { "alp", "bet", "gam", "del", "eps", "zet" };
-//XSTR:ON
-
-
 // coords to draw wingman status icons, for 1-5 wings (0-4)
 int HUD_wingman_left_coords[GR_NUM_RESOLUTIONS][5][2] = {
 	{ // GR_640
@@ -701,6 +691,8 @@ void hud_wingman_status_blit_dots(int wing_index, int screen_index, int num_wing
 	}
 
 	// draw wing name
+	bitmap = Wingman_status_frames[WINGMAN_STATUS_NAMES].first_frame + wing_index;
+
 	if ( num_wings_to_draw == 1 ) {
 		sx = HUD_wingman_status_single_coords[gr_screen.res][0][0] - 8;
 		sy = HUD_wingman_status_single_coords[gr_screen.res][0][1] + 26; 
@@ -708,8 +700,15 @@ void hud_wingman_status_blit_dots(int wing_index, int screen_index, int num_wing
 		sx = HUD_wingman_status_name_coords[gr_screen.res][screen_pos][0];
 		sy = HUD_wingman_status_name_coords[gr_screen.res][screen_pos][1]; 
 	}
+
+	// hud_set_default_color();
 	hud_set_gauge_color(HUD_WINGMEN_STATUS);
-	gr_string(sx, sy, Wingman_status_name_abbr[wing_index]);
+	if ( bitmap > -1 ) {
+		GR_AABITMAP(bitmap, sx, sy);
+		// gr_set_bitmap(bitmap);
+		// gr_aabitmap(sx, sy);
+	}
+
 }
 
 int hud_wingman_status_wingmen_exist(int num_wings_to_draw)

fs2_open/code/io/keycontrol.cpp

@@ -9,22 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Io/KeyControl.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 16:49:22 $
- * $Author: phreak $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:06 $
+ * $Author: penguin $
  *
  * Routines to read and deal with keyboard input.
  *
  * $Log: not supported by cvs2svn $
- *
- * Revision 2.2  2002/08/04 23:15:40  PhReAk
- * Fixed previous missile cheat, commented out beam_test(x) lines
- * in process_debug_keys().  beam_test(x) caused assertion failure in
- * beam.cpp apprx line 3147.  Also added toggle for wire_hud in process_player_ship_keys()
- *
- * Revision 2.1  2002/08/01 01:41:06  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:24  penguin
  * Warpcore CVS sync
  *
@@ -1075,7 +1066,7 @@ void process_debug_keys(int k)
 			break;
 		}
 
-			
+			/*
 		case KEY_DEBUGGED + KEY_SHIFTED + KEY_9: {
 		case KEY_DEBUGGED1 + KEY_SHIFTED + KEY_9:
 			ship* shipp;
@@ -1088,7 +1079,7 @@ void process_debug_keys(int k)
 			HUD_sourced_printf(HUD_SOURCE_HIDDEN, XSTR( "Secondary Weapon forced to %s", 18), Weapon_info[shipp->weapons.secondary_bank_weapons[shipp->weapons.current_secondary_bank]].name);
 			break;
 		}
-		
+		*/
 
 #ifndef FS2_DEMO
 		case KEY_DEBUGGED + KEY_U: {
@@ -1260,7 +1251,7 @@ void process_debug_keys(int k)
 			HUD_sourced_printf(HUD_SOURCE_HIDDEN, XSTR( "Skill level set to %s.", 25), Skill_level_names(Game_skill_level));
 			break;
 
-		/*// kill all missiles
+		// kill all missiles
 		case KEY_DEBUGGED + KEY_SHIFTED + KEY_1:
 			beam_test(1);
 			break;				
@@ -1297,7 +1288,7 @@ void process_debug_keys(int k)
 			break;		
 		case KEY_DEBUGGED + KEY_CTRLED + KEY_3:
 			beam_test_new(3);
-			break;*/
+			break;
 					
 #ifndef NO_SOUND
 		case KEY_DEBUGGED + KEY_T: {
@@ -1377,7 +1368,6 @@ void process_debug_keys(int k)
 
 			break;
 		}
-
 	}	// end switch
 
 }
@@ -1509,17 +1499,6 @@ void process_player_ship_keys(int k)
 		return;
 	}
 
-	//phreak 2002/08/04 - put this here for now
-	if (k==KEY_SHIFTED + KEY_CTRLED + KEY_Q)
-	{
-		extern int Targetbox_wire;
-		Targetbox_wire++;
-		if (Targetbox_wire==3)
-			Targetbox_wire=0;
-	}
-
-
-
 	// pass the key to the squadmate messaging code.  If the messaging code took the key, then return
 	// from here immediately since we don't want to do further key processing.
 	if ( hud_squadmsg_read_key(k) )

fs2_open/code/render/3dclipper.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Render/3dClipper.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 01:49:08 $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:09 $
  * $Author: penguin $
  *
  * Polygon clipping functions
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/01 01:41:09  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:27  penguin
  * Warpcore CVS sync
  *
@@ -262,8 +259,7 @@ int clip_plane(int plane_flag,vertex **src,vertex **dest,int *nv,ccodes *cc,uint
 	src[*nv] = src[0];
 	src[*nv+1] = src[1];
 
-	cc->cc_and = 0xff;
-	cc->cc_or = 0;
+	cc->and = 0xff; cc->or = 0;
 
 	for (i=1;i<=*nv;i++) {
 
@@ -272,16 +268,16 @@ int clip_plane(int plane_flag,vertex **src,vertex **dest,int *nv,ccodes *cc,uint
 			if (! (src[i-1]->codes & plane_flag)) {	//prev not off?
 
 				*dest = clip_edge(plane_flag,src[i-1],src[i],flags);
-				cc->cc_or  |= (*dest)->codes;
-				cc->cc_and &= (*dest)->codes;
+				cc->or  |= (*dest)->codes;
+				cc->and &= (*dest)->codes;
 				dest++;
 			}
 
 			if (! (src[i+1]->codes & plane_flag)) {
 
 				*dest = clip_edge(plane_flag,src[i+1],src[i],flags);
-				cc->cc_or  |= (*dest)->codes;
-				cc->cc_and &= (*dest)->codes;
+				cc->or  |= (*dest)->codes;
+				cc->and &= (*dest)->codes;
 				dest++;
 			}
 
@@ -294,8 +290,8 @@ int clip_plane(int plane_flag,vertex **src,vertex **dest,int *nv,ccodes *cc,uint
 
 			*dest++ = src[i];
 
-			cc->cc_or  |= src[i]->codes;
-			cc->cc_and &= src[i]->codes;
+			cc->or  |= src[i]->codes;
+			cc->and &= src[i]->codes;
 		}
 	}
 
@@ -310,11 +306,11 @@ vertex **clip_polygon(vertex **src,vertex **dest,int *nv,ccodes *cc,uint flags)
 
 	for (plane_flag=1;plane_flag<=CC_OFF_USER;plane_flag<<=1)
 
-		if (cc->cc_or & plane_flag) {
+		if (cc->or & plane_flag) {
 
 			*nv = clip_plane(plane_flag,src,dest,nv,cc,flags);
 
-			if (cc->cc_and)		//clipped away
+			if (cc->and)		//clipped away
 				return dest;
 
 			t = src; src = dest; dest = t;

fs2_open/code/render/3ddraw.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Render/3ddraw.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 01:49:08 $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:09 $
  * $Author: penguin $
  *
  * 3D rendering primitives
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/01 01:41:09  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:27  penguin
  * Warpcore CVS sync
  *
@@ -326,8 +323,7 @@ int g3_draw_poly(int nv,vertex **pointlist,uint tmap_flags)
 
 	Assert( G3_count == 1 );
 
-	cc.cc_or = 0;
-	cc.cc_and = 0xff;
+	cc.or = 0; cc.and = 0xff;
 
 	bufptr = Vbuf0;
 
@@ -336,19 +332,19 @@ int g3_draw_poly(int nv,vertex **pointlist,uint tmap_flags)
 
 		p = bufptr[i] = pointlist[i];
 
-		cc.cc_and &= p->codes;
-		cc.cc_or  |= p->codes;
+		cc.and &= p->codes;
+		cc.or  |= p->codes;
 	}
 
-	if (cc.cc_and)
+	if (cc.and)
 		return 1;	//all points off screen
 
-	if (cc.cc_or)	{
+	if (cc.or)	{
 		Assert( G3_count == 1 );
 
 		bufptr = clip_polygon(Vbuf0,Vbuf1,&nv,&cc,tmap_flags);
 
-		if (nv && !(cc.cc_or & CC_BEHIND) && !cc.cc_and) {
+		if (nv && !(cc.or&CC_BEHIND) && !cc.and) {
 
 			for (i=0;i<nv;i++) {
 				vertex *p = bufptr[i];
@@ -409,7 +405,7 @@ int g3_draw_poly_constant_sw(int nv,vertex **pointlist,uint tmap_flags, float co
 
 	Assert( G3_count == 1 );
 
-	cc.cc_or = 0; cc.cc_and = 0xff;
+	cc.or = 0; cc.and = 0xff;
 
 	bufptr = Vbuf0;
 
@@ -418,19 +414,19 @@ int g3_draw_poly_constant_sw(int nv,vertex **pointlist,uint tmap_flags, float co
 
 		p = bufptr[i] = pointlist[i];
 
-		cc.cc_and &= p->codes;
-		cc.cc_or  |= p->codes;
+		cc.and &= p->codes;
+		cc.or  |= p->codes;
 	}
 
-	if (cc.cc_and)
+	if (cc.and)
 		return 1;	//all points off screen
 
-	if (cc.cc_or)	{
+	if (cc.or)	{
 		Assert( G3_count == 1 );
 
 		bufptr = clip_polygon(Vbuf0, Vbuf1, &nv, &cc, tmap_flags);
 
-		if (nv && !(cc.cc_or & CC_BEHIND) && !cc.cc_and) {
+		if (nv && !(cc.or&CC_BEHIND) && !cc.and) {
 
 			for (i=0;i<nv;i++) {
 				vertex *p = bufptr[i];
@@ -816,8 +812,7 @@ float g3_draw_poly_constant_sw_area(int nv, vertex **pointlist, uint tmap_flags,
 
 	Assert( G3_count == 1 );
 
-	cc.cc_or = 0;
-	cc.cc_and = 0xff;
+	cc.or = 0; cc.and = 0xff;
 
 	bufptr = Vbuf0;
 
@@ -826,20 +821,20 @@ float g3_draw_poly_constant_sw_area(int nv, vertex **pointlist, uint tmap_flags,
 
 		p = bufptr[i] = pointlist[i];
 
-		cc.cc_and &= p->codes;
-		cc.cc_or  |= p->codes;
+		cc.and &= p->codes;
+		cc.or  |= p->codes;
 	}
 
-	if (cc.cc_and){
+	if (cc.and){
 		return 0.0f;	//all points off screen
 	}
 
-	if (cc.cc_or)	{
+	if (cc.or)	{
 		Assert( G3_count == 1 );
 
 		bufptr = clip_polygon(Vbuf0, Vbuf1, &nv, &cc, tmap_flags);
 
-		if (nv && !(cc.cc_or & CC_BEHIND) && !cc.cc_and) {
+		if (nv && !(cc.or&CC_BEHIND) && !cc.and) {
 
 			for (i=0;i<nv;i++) {
 				vertex *p = bufptr[i];

fs2_open/code/ui/ui.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Ui/UI.H $
- * $Revision: 2.2 $
- * $Date: 2002-08-06 03:50:48 $
+ * $Revision: 2.1 $
+ * $Date: 2002-08-01 01:41:10 $
  * $Author: penguin $
  *
  * Include file for our user interface.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/01 01:41:10  penguin
- * The big include file move
- *
  * Revision 2.0  2002/06/03 04:02:29  penguin
  * Warpcore CVS sync
  *
@@ -382,17 +379,17 @@ class UI_DOT_SLIDER_NEW;
 
 class UI_GADGET
 {
-	friend class UI_WINDOW;
-	friend class UI_BUTTON;
-	friend class UI_KEYTRAP;
-	friend class UI_CHECKBOX;
-	friend class UI_RADIO;
-	friend class UI_SCROLLBAR;
-	friend class UI_LISTBOX;
-	friend class UI_INPUTBOX;
-	// friend class UI_SLIDER;
-	friend class UI_DOT_SLIDER;	
-	friend class UI_DOT_SLIDER_NEW;
+	friend UI_WINDOW;
+	friend UI_BUTTON;
+	friend UI_KEYTRAP;
+	friend UI_CHECKBOX;
+	friend UI_RADIO;
+	friend UI_SCROLLBAR;
+	friend UI_LISTBOX;
+	friend UI_INPUTBOX;
+	// friend UI_SLIDER;
+	friend UI_DOT_SLIDER;	
+	friend UI_DOT_SLIDER_NEW;
 
 	protected:
 		char *bm_filename;
@@ -516,10 +513,10 @@ typedef struct UI_XSTR {
 
 class UI_BUTTON : public UI_GADGET
 {
-	friend class UI_SCROLLBAR;
-	// friend class UI_SLIDER;
-	friend class UI_DOT_SLIDER;
-	friend class UI_DOT_SLIDER_NEW;
+	friend UI_SCROLLBAR;
+	// friend UI_SLIDER;
+	friend UI_DOT_SLIDER;
+	friend UI_DOT_SLIDER_NEW;
 
 		char *text;
 		int position;			// indicates position of button (0 - up, 1 - down by mouse click 2 - down by keypress
@@ -714,8 +711,8 @@ class UI_RADIO : public UI_GADGET
 
 class UI_SCROLLBAR : public UI_GADGET
 {
-	friend class UI_LISTBOX;
-	friend class UI_BUTTON;
+	friend UI_LISTBOX;
+	friend UI_BUTTON;
 		int horz;
 		int start;
 		int stop;
@@ -752,7 +749,7 @@ class UI_SCROLLBAR : public UI_GADGET
 
 class UI_SLIDER2 : public UI_GADGET
 {
-	friend class UI_BUTTON;
+	friend UI_BUTTON;
 	private:
 		int numberItems;				// total range
 		int numberPositions;			// total positions (height - bitmapbuttonheight)
@@ -810,7 +807,7 @@ class UI_SLIDER2 : public UI_GADGET
 // to be phased out eventually in FS2
 class UI_DOT_SLIDER : public UI_GADGET
 {
-	friend class UI_BUTTON;
+	friend UI_BUTTON;
 
 		UI_BUTTON button;
 		UI_BUTTON up_button;
@@ -830,7 +827,7 @@ class UI_DOT_SLIDER : public UI_GADGET
 
 class UI_DOT_SLIDER_NEW : public UI_GADGET
 {
-	friend class UI_BUTTON;
+	friend UI_BUTTON;
 		UI_BUTTON button;
 		UI_BUTTON up_button;
 		UI_BUTTON down_button;		
@@ -903,19 +900,19 @@ class UI_LISTBOX : public UI_GADGET
 
 class UI_WINDOW
 {
-	friend class UI_GADGET;
-	friend class UI_BUTTON;
-	friend class UI_KEYTRAP;
-	friend class UI_CHECKBOX;
-	friend class UI_RADIO;
-	friend class UI_SCROLLBAR;
-	friend class UI_LISTBOX;
-	friend class UI_INPUTBOX;
-	// friend class UI_SLIDER;
-	friend class UI_SLIDER2;
-	friend class UI_DOT_SLIDER;
-	friend class UI_DOT_SLIDER_NEW;
-	friend class UI_ICON;
+	friend UI_GADGET;
+	friend UI_BUTTON;
+	friend UI_KEYTRAP;
+	friend UI_CHECKBOX;
+	friend UI_RADIO;
+	friend UI_SCROLLBAR;
+	friend UI_LISTBOX;
+	friend UI_INPUTBOX;
+	// friend UI_SLIDER;
+	friend UI_SLIDER2;
+	friend UI_DOT_SLIDER;
+	friend UI_DOT_SLIDER_NEW;
+	friend UI_ICON;
 
 protected:
 	int flags;
@@ -1010,7 +1007,7 @@ void ui_sort_filenames( int n, char **list );
 /*
 class UI_SLIDER : public UI_GADGET
 {
-	friend class UI_BUTTON;
+	friend UI_BUTTON;
 		int horz;
 		int position;
 		int window_size;