Housekeeping.

reaction/code/game/zcam.c

@@ -114,8 +114,13 @@ gentity_t *PlayerToTrack(gentity_t * ent, gentity_t * target1st);
 
 #ifndef Q3_VM
 
+#ifndef acosf
 #define acosf(x)        ((float)acos(x))
+#endif
+
+#ifndef asinf
 #define asinf(x)        ((float)asin(x))
+#endif
 
 #else
 

reaction/code/qcommon/cm_trace.c

@@ -41,7 +41,7 @@ BASIC MATH
 RotatePoint
 ================
 */
-void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // FIXME 
+static void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // FIXME 
 	vec3_t tvec;
 
 	VectorCopy(point, tvec);
@@ -55,7 +55,7 @@ void RotatePoint(vec3_t point, /*const*/ vec3_t matrix[3]) { // FIXME
 TransposeMatrix
 ================
 */
-void TransposeMatrix(/*const*/ vec3_t matrix[3], vec3_t transpose[3]) { // FIXME
+static void TransposeMatrix(/*const*/ vec3_t matrix[3], vec3_t transpose[3]) { // FIXME
 	int i, j;
 	for (i = 0; i < 3; i++) {
 		for (j = 0; j < 3; j++) {
@@ -69,7 +69,7 @@ void TransposeMatrix(/*const*/ vec3_t matrix[3], vec3_t transpose[3]) { // FIXME
 CreateRotationMatrix
 ================
 */
-void CreateRotationMatrix(const vec3_t angles, vec3_t matrix[3]) {
+static void CreateRotationMatrix(const vec3_t angles, vec3_t matrix[3]) {
 	AngleVectors(angles, matrix[0], matrix[1], matrix[2]);
 	VectorInverse(matrix[1]);
 }

reaction/code/qcommon/q_math.c

@@ -184,29 +184,16 @@ signed short ClampShort( int i ) {
 
 
 // this isn't a real cheap function to call!
-int DirToByte( vec3_t dir ) {
+// Makro - a lot cheaper now
-	int		i, best;
-	float	d, bestd;
 
-	if ( !dir ) {
+int DirToByte(vec3_t dir)
-		return 0;
+{
-	}
+	vec3_t angles;
-
+	vectoangles(dir, angles);
-	bestd = 0;
+	return ((int) (angles[YAW] * 16 / 360.0f) & 15) | ((((int) (angles[PITCH] * 16 / 360.0f)) & 15) << 4);
-	best = 0;
-	for (i=0 ; i<NUMVERTEXNORMALS ; i++)
-	{
-		d = DotProduct (dir, bytedirs[i]);
-		if (d > bestd)
-		{
-			bestd = d;
-			best = i;
-		}
-	}
-
-	return best;
 }
 
+
 void ByteToDir( int b, vec3_t dir ) {
 	if ( b < 0 || b >= NUMVERTEXNORMALS ) {
 		VectorCopy( vec3_origin, dir );
@@ -1307,3 +1294,132 @@ int Q_isnan( float x )
 
 	return (int)( (unsigned int)fi.ui >> 31 );
 }
+
+
+// By NiceAss. Used for reflection of sparks on metal surfaces
+int ReflectVectorByte(vec3_t dir, vec3_t plane)
+{
+	vec3_t final;
+	float dot;
+
+	dot = DotProduct(dir, plane);
+	VectorMA(dir, -2 * dot, plane, final);
+
+	return DirToByte(final);
+}
+
+//Makro - moved from g_mover.c
+/*
+================
+CreateRotationMatrix
+================
+*/
+void CreateRotationMatrix(vec3_t angles, vec3_t matrix[3])
+{
+	AngleVectors(angles, matrix[0], matrix[1], matrix[2]);
+	VectorInverse(matrix[1]);
+}
+
+/*
+================
+TransposeMatrix
+================
+*/
+void TransposeMatrix(vec3_t matrix[3], vec3_t transpose[3])
+{
+	int i, j;
+
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 3; j++) {
+			transpose[i][j] = matrix[j][i];
+		}
+	}
+}
+
+/*
+================
+RotatePoint
+================
+*/
+void RotatePoint(vec3_t point, vec3_t matrix[3])
+{
+	vec3_t tvec;
+
+	VectorCopy(point, tvec);
+	point[0] = DotProduct(matrix[0], tvec);
+	point[1] = DotProduct(matrix[1], tvec);
+	point[2] = DotProduct(matrix[2], tvec);
+}
+
+//Makro - added
+void ChangeRefSystem(vec3_t in, vec3_t neworg, vec3_t newaxis[], vec3_t out)
+{
+	vec3_t result;
+
+	VectorScale(newaxis[0], in[0], result);
+	VectorMA(result, in[1], newaxis[1], result);
+	VectorMA(result, in[2], newaxis[2], result);
+
+	if (neworg)
+		VectorAdd(result, neworg, result);
+
+	VectorCopy(result, out);
+}
+
+//Makro - added
+void ChangeBackRefSystem(vec3_t in, vec3_t neworg, vec3_t newaxis[], vec3_t out)
+{
+	vec3_t dif;
+	
+	if (neworg)
+		VectorSubtract(in, neworg, dif);
+	else
+		VectorCopy(in, dif);
+	out[0] = DotProduct(dif, newaxis[0]);
+	out[1] = DotProduct(dif, newaxis[1]);
+	out[2] = DotProduct(dif, newaxis[2]);
+}
+
+void ChangeAngleRefSystem(vec3_t in, vec3_t newaxis[], vec3_t out)
+{
+	vec3_t result;
+
+	/*
+	result[YAW_AXIS] = in[YAW];
+	result[PITCH_AXIS] = in[PITCH];
+	result[ROLL_AXIS] = in[ROLL];
+	VectorCopy(result, in);
+	*/
+
+	VectorMA(vec3_origin, in[YAW], newaxis[YAW_AXIS], result);
+	VectorMA(result, in[PITCH], newaxis[PITCH_AXIS], result);
+	VectorMA(result, in[ROLL], newaxis[ROLL_AXIS], result);
+	//VectorCopy(result, out);
+	out[YAW] = result[YAW_AXIS];
+	out[PITCH] = result[PITCH_AXIS];
+	out[ROLL] = result[ROLL_AXIS];
+	//VectorCopy(in, out);
+}
+
+void ToAxisAngles(vec3_t in, vec3_t out)
+{
+	vec3_t angles, result, forward;
+	
+	VectorClear(result);
+	//yaw - around the Z axis
+	result[YAW_AXIS] = in[YAW];
+	
+	//pitch - around the new Y axis
+	angles[YAW] = in[YAW];
+	angles[PITCH] = angles[ROLL] = 0;
+	AngleVectors(angles, NULL, forward, NULL);
+	VectorMA(result, -in[PITCH], forward, result);
+	result[PITCH_AXIS] = in[PITCH];
+	
+	//roll - around the new X axis
+	angles[PITCH] = in[PITCH];
+	AngleVectors(angles, forward, NULL, NULL);
+	VectorMA(result, in[ROLL], forward, result);
+
+	VectorCopy(result, out);
+}

reaction/code/qcommon/q_shared.c

@@ -81,21 +81,21 @@ COM_StripExtension
 ============
 */
 void COM_StripExtension( const char *in, char *out, int destsize ) {
-	int             length;
-
 	Q_strncpyz(out, in, destsize);
-
+	COM_StripExtensionInPlace(out);
-	length = strlen(out)-1;
-	while (length > 0 && out[length] != '.')
-	{
-		length--;
-		if (out[length] == '/')
-			return;		// no extension
-	}
-	if (length)
-		out[length] = 0;
 }
 
+/*
+============
+COM_StripExtensionInPlace
+============
+*/
+void COM_StripExtensionInPlace(char *name)
+{
+	char* ext = Q_strrchr(name, '.');
+	if (ext)
+		*ext = 0;
+}
 
 /*
 ==================
@@ -734,9 +734,9 @@ Safe strncpy that ensures a trailing zero
 =============
 */
 void Q_strncpyz( char *dest, const char *src, int destsize ) {
-  if ( !dest ) {
+	if ( !dest ) {
-    Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
+		Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
-  }
+	}
 	if ( !src ) {
 		Com_Error( ERR_FATAL, "Q_strncpyz: NULL src" );
 	}
@@ -744,8 +744,11 @@ void Q_strncpyz( char *dest, const char *src, int destsize ) {
 		Com_Error(ERR_FATAL,"Q_strncpyz: destsize < 1" ); 
 	}
 
+	if ( dest == src  )
+		return;
+	
 	strncpy( dest, src, destsize-1 );
-  dest[destsize-1] = 0;
+	dest[destsize-1] = 0;
 }
                  
 int Q_stricmpn (const char *s1, const char *s2, int n) {
@@ -1002,6 +1005,70 @@ void Com_TruncateLongString( char *buffer, const char *s )
 	}
 }
 
+/*
+=============
+TempVector
+
+This is just a convenience function
+for making temporary vectors for function calls
+=============
+*/
+float *tv(float x, float y, float z)
+{
+	static int index;
+	static vec3_t vecs[8];
+	float *v;
+
+	// use an array so that multiple tempvectors won't collide
+	// for a while
+	v = vecs[index];
+	index = (index + 1) & 7;
+
+	v[0] = x;
+	v[1] = y;
+	v[2] = z;
+
+	return v;
+}
+
+/*
+=============
+VectorToString
+
+This is just a convenience function
+for printing vectors
+=============
+*/
+char *vtos(const vec3_t v)
+{
+	static int index;
+	static char str[8][32];
+	char *s;
+
+	// use an array so that multiple vtos won't collide
+	s = str[index];
+	index = (index + 1) & 7;
+
+	Com_sprintf(s, 32, "(%.3f %.3f %.3f)", v[0], v[1], v[2]);
+
+	return s;
+}
+
+//====================================================================
+// JBravo: moved from g_weapon.c
+void SnapVectorTowards( vec3_t v, vec3_t to )
+{
+	int i;
+
+	for (i = 0 ; i < 3 ; i++) {
+		if ( to[i] <= v[i] ) {
+			v[i] = (int)v[i];
+		} else {
+			v[i] = (int)v[i] + 1;
+		}
+	}
+}
+
 /*
 =====================================================================
 

reaction/code/qcommon/q_shared.h

@@ -187,6 +187,11 @@ typedef int		clipHandle_t;
 #define	YAW					1		// left / right
 #define	ROLL				2		// fall over
 
+//Makro - angle axis
+#define PITCH_AXIS			1
+#define YAW_AXIS			2
+#define ROLL_AXIS			0
+
 // the game guarantees that no string from the network will ever
 // exceed MAX_STRING_CHARS
 #define	MAX_STRING_CHARS	1024	// max length of a string passed to Cmd_TokenizeString
@@ -322,8 +327,9 @@ typedef	int	fixed16_t;
 #define M_PI		3.14159265358979323846f	// matches value in gcc v2 math.h
 #endif
 
-#define NUMVERTEXNORMALS	162
+//Makro - changed from 162 to 256 in order to use the new bytedirs table
-extern	vec3_t	bytedirs[NUMVERTEXNORMALS];
+#define NUMVERTEXNORMALS	256
+extern vec3_t bytedirs[NUMVERTEXNORMALS];
 
 // all drawing is done to a 640*480 virtual screen size
 // and will be automatically scaled to the real resolution
@@ -355,7 +361,7 @@ extern	vec4_t		colorMdGrey;
 extern	vec4_t		colorDkGrey;
 
 #define Q_COLOR_ESCAPE	'^'
-#define Q_IsColorString(p)	( p && *(p) == Q_COLOR_ESCAPE && *((p)+1) && isalnum(*((p)+1)) ) // ^[0-9a-zA-Z]
+#define Q_IsColorString(p)	( p && *(p) == Q_COLOR_ESCAPE && *((p)+1) && *((p)+1) != Q_COLOR_ESCAPE )
 
 #define COLOR_BLACK		'0'
 #define COLOR_RED		'1'
@@ -376,11 +382,25 @@ extern	vec4_t		colorDkGrey;
 #define S_COLOR_MAGENTA	"^6"
 #define S_COLOR_WHITE	"^7"
 
+//Makro - reset color
+#define S_COLOR_RESET	"^*"
+
 extern vec4_t	g_color_table[8];
 
 #define	MAKERGB( v, r, g, b ) v[0]=r;v[1]=g;v[2]=b
 #define	MAKERGBA( v, r, g, b, a ) v[0]=r;v[1]=g;v[2]=b;v[3]=a
 
+//Makro - for the UI
+
+#define Vector2Copy(a,b)			((b)[0]=(a)[0],(b)[1]=(a)[1])
+#define Vector2MA(v,s,b,o)			((o)[0]=(v)[0]+(b)[0]*(s),(o)[1]=(v)[1]+(b)[1]*(s))
+#define Vector2Add(a,b,o)			((o)[0]=(a)[0]+(b)[0],(o)[1]=(a)[1]+(b)[1])
+#define Vector2Subtract(a,b,o)		((o)[0]=(a)[0]-(b)[0],(o)[1]=(a)[1]-(b)[1])
+#define Vector2Scale(a,s,o)			((o)[0]=(a)[0]*(s),(o)[1]=(a)[1]*(s))
+#define Vector2Negate(a,o)			((o)[0]=-(a)[0],(o)[1]=-(a)[1])
+#define Vector2Set(v,x,y)			((v)[0]=(x),(v)[1]=(y))
+#define Vector2Norm2(v)				((v)[0]*(v)[0]+(v)[1]*(v)[1])
+
 #define DEG2RAD( a ) ( ( (a) * M_PI ) / 180.0F )
 #define RAD2DEG( a ) ( ( (a) * 180.0f ) / M_PI )
 
@@ -621,6 +641,7 @@ float Com_Clamp( float min, float max, float value );
 char	*COM_SkipPath( char *pathname );
 const char	*COM_GetExtension( const char *name );
 void	COM_StripExtension(const char *in, char *out, int destsize);
+void	COM_StripExtensionInPlace(char* name);
 void	COM_DefaultExtension( char *path, int maxSize, const char *extension );
 
 void	COM_BeginParseSession( const char *name );
@@ -743,7 +764,8 @@ float	LittleFloat (const float *l);
 
 void	Swap_Init (void);
 */
-char	* QDECL va(char *format, ...) __attribute__ ((format (printf, 1, 2)));
+char	*QDECL va(char *format, ...) __attribute__ ((format (printf, 1, 2)));
+float	*tv(float x, float y, float z);
 
 #define TRUNCATE_LENGTH	64
 void Com_TruncateLongString( char *buffer, const char *s );

reaction/code/ui/ui_local.h

@@ -92,7 +92,7 @@
 #ifndef __UI_LOCAL_H__
 #define __UI_LOCAL_H__
 
-#include "../game/q_shared.h"
+#include "../qcommon/q_shared.h"
 #include "../cgame/tr_types.h"
 #include "ui_public.h"
 #include "keycodes.h"

reaction/code/ui/ui_main.c

@@ -8103,7 +8103,7 @@ static void UI_BuildQ3Model_List(void)
 		for (j = 0; j < numfiles && uiInfo.q3HeadCount < MAX_PLAYERMODELS; j++, fileptr += filelen + 1) {
 			filelen = strlen(fileptr);
 
-			COM_StripExtension(fileptr, skinname);
+			COM_StripExtension(fileptr, skinname, sizeof(skinname));
 
 			// look for icon_????
 			if (Q_stricmpn(skinname, "icon_", 5) == 0

reaction/code/ui/ui_players.c

@@ -104,7 +104,7 @@ static void UI_PlayerInfo_SetWeapon(playerInfo_t * pi, weapon_t weaponNum)
 	   } */
 
 	strcpy(path, item->world_model[0]);
-	COM_StripExtension(path, path);
+	COM_StripExtensionInPlace(path);
 	strcat(path, "_flash.md3");
 	pi->flashModel = trap_R_RegisterModel(path);
 

reaction/code/ui/ui_shared.c

@@ -1185,7 +1185,7 @@ itemDef_t *Menu_ClearFocus(menuDef_t * menu)
 	return ret;
 }
 
-qboolean IsVisible(int flags)
+static qboolean IsVisible(int flags)
 {
 	return (flags & WINDOW_VISIBLE && !(flags & WINDOW_FADINGOUT));
 }

reaction/code/ui/ui_shared.h

@@ -73,7 +73,7 @@
 #ifndef __UI_SHARED_H
 #define __UI_SHARED_H
 
-#include "../game/q_shared.h"
+#include "../qcommon/q_shared.h"
 #include "../cgame/tr_types.h"
 #include "keycodes.h"
 

reaction/misc/msvc/cgame.vcproj

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="cgame"
 	ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
 	RootNamespace="cgame"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -83,6 +84,8 @@
 				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"
 			/>
@@ -104,9 +107,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -180,6 +180,8 @@
 				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"
 			/>
@@ -201,9 +203,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -277,6 +276,8 @@
 				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"
 			/>
@@ -298,9 +299,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -374,6 +372,8 @@
 				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"
 			/>
@@ -395,9 +395,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -415,7 +412,6 @@
 				>
 				<FileConfiguration
 					Name="Release TA|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -425,7 +421,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -436,7 +431,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -446,7 +440,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug TA|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -582,6 +575,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\cgame\cg_atmospheric.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\cgame\cg_consolecmds.c"
 				>
@@ -1007,6 +1004,7 @@
 				>
 				<FileConfiguration
 					Name="Release TA|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1037,6 +1035,7 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug TA|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1340,6 +1339,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\cgame\cg_unlagged.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\cgame\cg_view.c"
 				>
@@ -1437,6 +1440,7 @@
 				>
 				<FileConfiguration
 					Name="Release TA|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1446,6 +1450,7 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1456,6 +1461,7 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1465,6 +1471,7 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug TA|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"

reaction/misc/msvc/game.vcproj

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="game"
 	ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -82,6 +83,8 @@
 				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"
 			/>
@@ -103,9 +106,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -179,6 +179,8 @@
 				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"
 			/>
@@ -200,9 +202,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -276,6 +275,8 @@
 				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"
 			/>
@@ -297,9 +298,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -373,6 +371,8 @@
 				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"
 			/>
@@ -394,9 +394,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -1211,6 +1208,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_matchmode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_mem.c"
 				>
@@ -1379,6 +1380,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\game\g_scripts.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_session.c"
 				>
@@ -1631,6 +1640,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_teamplay.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_trigger.c"
 				>
@@ -1673,6 +1686,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_unlagged.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_utils.c"
 				>
@@ -1765,6 +1782,18 @@
 				RelativePath="..\..\code\qcommon\q_shared.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\game\rxn_game.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\game\zcam.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\game\zcam_target.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1850,14 +1879,30 @@
 				RelativePath="..\..\code\game\g_local.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_matchmode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\game\g_parser.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_public.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_scripts.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\g_team.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\game\g_teamplay.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\game\inv.h"
 				>
@@ -1878,6 +1923,10 @@
 				RelativePath="..\..\code\game\syn.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\game\zcam.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

reaction/misc/msvc/ioq3.sln

@@ -1,11 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
+Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2005
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
@@ -34,12 +32,6 @@ Global
 		{F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|Win32.Build.0 = Release TA|Win32
 		{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.ActiveCfg = Release|Win32
 		{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.Build.0 = Release|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.Build.0 = Debug|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|Win32.ActiveCfg = Release TA|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.ActiveCfg = Release|Win32
-		{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.Build.0 = Release|Win32
 		{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
 		{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.Build.0 = Debug TA|Win32
 		{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|Win32.ActiveCfg = Debug|Win32

reaction/misc/msvc/q3_ui.vcproj

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="q3_ui"
 	ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -83,6 +84,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"
 			/>
@@ -104,9 +107,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -177,6 +177,8 @@
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile="q3_ui.def"
 				ProgramDatabaseFile="$(IntDir)\uix86_old.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\q3_ui.lib"
 				TargetMachine="1"
 			/>
@@ -198,9 +200,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -271,6 +270,8 @@
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\q3_ui.def"
 				ProgramDatabaseFile="$(IntDir)\uix86.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"
 			/>
@@ -292,9 +293,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -369,6 +367,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"
 			/>
@@ -390,9 +390,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>

reaction/misc/msvc/quake3.vcproj

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="quake3"
 	ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -83,6 +84,8 @@
 				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -103,9 +106,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Post build processing.."
@@ -184,6 +184,8 @@
 				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -204,9 +206,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Post build processing.."
@@ -283,6 +282,8 @@
 				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -303,9 +304,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -343,7 +341,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include"
-				PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;MISSIONPACK;STANDALONE;USE_INTERNAL_SPEEX;USE_LOCAL_HEADERS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@@ -381,6 +379,8 @@
 				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -401,9 +401,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Post build processing.."

reaction/misc/msvc/ui.vcproj

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="ui"
 	ProjectGUID="{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -82,6 +83,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"
 			/>
@@ -103,9 +106,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -179,6 +179,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86_new.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86_new.lib"
 				TargetMachine="1"
 			/>
@@ -200,9 +202,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -275,6 +274,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86_new.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86_new.lib"
 				TargetMachine="1"
 			/>
@@ -296,9 +297,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -373,6 +371,8 @@
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"
 			/>
@@ -394,9 +394,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -414,7 +411,6 @@
 				>
 				<FileConfiguration
 					Name="Release TA|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -424,7 +420,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -436,7 +431,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -446,7 +440,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug TA|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -884,24 +877,8 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\code\game\q_shared.h"
+				RelativePath="..\..\code\qcommon\q_shared.h"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\code\game\surfaceflags.h"