Module twilight: Change committed

black at icculus.org black at icculus.org
Wed Jan 5 15:33:22 EST 2005


Commiter   : black
CVSROOT    : /cvs/cvsroot/twilight
Module     : twilight
Commit time: 2005-01-05 20:33:22 UTC

Log message:

-Ive updated the .NET project files (I hope they now work for everyone).
-Updated twiconfig.h to support VC7(.1)'s __FUNCTION__ macro.

Modified files:
     twilight.sln src/base/twilight_base.vcproj
     src/client/twilight_client.vcproj src/image/twilight_image.vcproj
     src/include/twiconfig.h src/nq/nq.vcproj src/qw/qw.vcproj
     src/qw/qwsv.vcproj src/renderer/twilight_renderer.vcproj
     src/sound/twilight_sound.vcproj

------=MIME.4e5411ffa323fe620ab7a0eae37d038f
Content-Type: text/plain; name="twilight.20050105.203322.black.diff"
Content-Disposition: attachment; filename="twilight.20050105.203322.black.diff"
Content-Transfer-Encoding: 8bit

Index: twilight/src/base/twilight_base.vcproj
diff -u twilight/src/base/twilight_base.vcproj:1.5 twilight/src/base/twilight_base.vcproj:1.6
--- twilight/src/base/twilight_base.vcproj:1.5	Tue Mar 16 02:31:57 2004
+++ twilight/src/base/twilight_base.vcproj	Wed Jan  5 15:33:11 2005
@@ -21,8 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../client,../../../SDL/include"
+				AdditionalIncludeDirectories="..,../client,../fs,../image,../include,../renderer,../base"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -72,7 +71,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include,../client,../../../SDL/include"
+				AdditionalIncludeDirectories="..,../client,../fs,../image,../include,../renderer,../base"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -240,7 +239,64 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\lh_parser.c">
+				RelativePath="hash.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="lh_parser.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="loadso.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="locs.c">
@@ -323,7 +379,24 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\menu.c">
+				RelativePath="menu.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="mod_brush.c">
@@ -386,10 +459,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sdlstub.c">
-			</File>
-			<File
-				RelativePath="strlib.c">
+				RelativePath="sdlstub.c">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
@@ -409,7 +479,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="wad.c">
+				RelativePath="strlib.c">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
@@ -449,124 +519,6 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\include\anorm_dots.h">
-			</File>
-			<File
-				RelativePath="..\include\anorms.h">
-			</File>
-			<File
-				RelativePath="..\include\cmd.h">
-			</File>
-			<File
-				RelativePath="..\include\collision.h">
-			</File>
-			<File
-				RelativePath="..\include\common.h">
-			</File>
-			<File
-				RelativePath="..\include\console.h">
-			</File>
-			<File
-				RelativePath="..\include\cpu.h">
-			</File>
-			<File
-				RelativePath="..\include\crc.h">
-			</File>
-			<File
-				RelativePath="..\include\cvar.h">
-			</File>
-			<File
-				RelativePath="..\include\draw.h">
-			</File>
-			<File
-				RelativePath="..\include\gl_warp_sin.h">
-			</File>
-			<File
-				RelativePath="..\include\host.h">
-			</File>
-			<File
-				RelativePath="..\include\info.h">
-			</File>
-			<File
-				RelativePath="..\include\input.h">
-			</File>
-			<File
-				RelativePath="..\include\keys.h">
-			</File>
-			<File
-				RelativePath="..\include\locs.h">
-			</File>
-			<File
-				RelativePath="..\include\mathlib.h">
-			</File>
-			<File
-				RelativePath="..\include\matrixlib.h">
-			</File>
-			<File
-				RelativePath="..\include\mdfour.h">
-			</File>
-			<File
-				RelativePath="..\include\menu.h">
-			</File>
-			<File
-				RelativePath="..\include\mod_brush_disk.h">
-			</File>
-			<File
-				RelativePath="..\include\mod_brush.h">
-			</File>
-			<File
-				RelativePath="..\include\model.h">
-			</File>
-			<File
-				RelativePath="..\include\pmove.h">
-			</File>
-			<File
-				RelativePath="..\include\pr_comp.h">
-			</File>
-			<File
-				RelativePath="..\include\qtypes.h">
-			</File>
-			<File
-				RelativePath="..\include\quakedef.h">
-			</File>
-			<File
-				RelativePath="..\include\r_explosion.h">
-			</File>
-			<File
-				RelativePath="..\include\sbar.h">
-			</File>
-			<File
-				RelativePath="..\include\strlib.h">
-			</File>
-			<File
-				RelativePath="..\include\sys.h">
-			</File>
-			<File
-				RelativePath="..\include\teamplay.h">
-			</File>
-			<File
-				RelativePath="..\include\twiconfig.h">
-			</File>
-			<File
-				RelativePath="..\include\vid.h">
-			</File>
-			<File
-				RelativePath="..\include\view.h">
-			</File>
-			<File
-				RelativePath="..\include\wad.h">
-			</File>
-			<File
-				RelativePath="..\include\win32config.h">
-			</File>
-			<File
-				RelativePath="..\include\zone.h">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
Index: twilight/src/client/twilight_client.vcproj
diff -u twilight/src/client/twilight_client.vcproj:1.2 twilight/src/client/twilight_client.vcproj:1.3
--- twilight/src/client/twilight_client.vcproj:1.2	Wed Oct 15 15:15:36 2003
+++ twilight/src/client/twilight_client.vcproj	Wed Jan  5 15:33:11 2005
@@ -3,7 +3,6 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="twilight_client"
-	ProjectGUID="{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -12,35 +11,33 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../renderer,../../../SDL/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
+				Optimization="0"
+				AdditionalIncludeDirectories="../,../base,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/twilight_client.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile=".\Debug/twilight_client.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Release\twilight_client.lib"
+				OutputFile=".\Debug\twilight_client.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -52,8 +49,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"/>
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -64,33 +61,34 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include,../renderer,../../../SDL/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../,../base,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/twilight_client.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=".\Release/twilight_client.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Debug\twilight_client.lib"
+				OutputFile=".\Release\twilight_client.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -102,8 +100,8 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"/>
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -121,35 +119,144 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\cclient.c">
-			</File>
-			<File
-				RelativePath=".\console.c">
+				RelativePath="cclient.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\hud.c">
+				RelativePath="console.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\input.c">
+				RelativePath="dlight.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\keys.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath=".\cclient.h">
+				RelativePath="hud.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\console.h">
+				RelativePath="input.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\hud.h">
+				RelativePath="keys.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\keys.h">
+				RelativePath="teamplay.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
Index: twilight/src/image/twilight_image.vcproj
diff -u twilight/src/image/twilight_image.vcproj:1.3 twilight/src/image/twilight_image.vcproj:1.4
--- twilight/src/image/twilight_image.vcproj:1.3	Tue Mar 16 02:31:57 2004
+++ twilight/src/image/twilight_image.vcproj	Wed Jan  5 15:33:11 2005
@@ -20,10 +20,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../base,../fs,../include,../renderer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug/twilight_image.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -71,11 +71,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../base,../fs,../include,../renderer"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release/twilight_image.pch"
@@ -200,7 +199,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="tga.c">
+				RelativePath="sdlimage.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -219,24 +218,25 @@
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="image.h">
-			</File>
-			<File
-				RelativePath="jpeg.h">
-			</File>
 			<File
-				RelativePath="pcx.h">
-			</File>
-			<File
-				RelativePath="qlmp.h">
-			</File>
-			<File
-				RelativePath="tga.h">
+				RelativePath="tga.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
Index: twilight/src/include/twiconfig.h
diff -u twilight/src/include/twiconfig.h:1.12 twilight/src/include/twiconfig.h:1.13
--- twilight/src/include/twiconfig.h:1.12	Sat Dec 20 19:06:23 2003
+++ twilight/src/include/twiconfig.h	Wed Jan  5 15:33:11 2005
@@ -21,7 +21,7 @@
 		59 Temple Place - Suite 330
 		Boston, MA  02111-1307, USA
 
-	$Id: twiconfig.h,v 1.12 2003/12/21 00:06:23 warp Exp $
+	$Id: twiconfig.h,v 1.13 2005/01/05 20:33:11 black Exp $
 */
 
 #ifndef __TWICONFIG_H
@@ -56,7 +56,7 @@
 # include "sdlstub.h"
 #endif
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) && (!defined(_MSC_VER) || _MSC_VER < 1300)
 #define __FUNCTION__	"Not A Clue!"
 #endif
 
Index: twilight/src/nq/nq.vcproj
diff -u twilight/src/nq/nq.vcproj:1.4 twilight/src/nq/nq.vcproj:1.5
--- twilight/src/nq/nq.vcproj:1.4	Tue Mar 16 02:31:57 2004
+++ twilight/src/nq/nq.vcproj	Wed Jan  5 15:33:11 2005
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include,../client,../image,../renderer,../sound,../../../SDL/include,../src/sound,../src/image"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_SDL_H"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -38,10 +38,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
-				OutputFile="tw-nq-debug.exe"
+				OutputFile="../../tw-nq-debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../SDL/lib"
+				AdditionalLibraryDirectories="../SDL/lib"
 				IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/tw-nq-debug.pdb"
@@ -87,8 +87,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../client,../image,../renderer,../sound,../../../SDL/include,../src/sound,../src/image"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;HAVE_SDL_H"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -106,10 +105,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
-				OutputFile="tw-nq.exe"
+				OutputFile="../../tw-nq.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../SDL/lib"
+				AdditionalLibraryDirectories="../SDL/lib"
 				IgnoreDefaultLibraryNames="libc.lib"
 				ProgramDatabaseFile=".\Release/tw-nq.pdb"
 				SubSystem="2"
@@ -691,23 +690,20 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="teamplay.c">
+				RelativePath="..\twilight.rc">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
+						Name="VCResourceCompilerTool"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -751,53 +747,9 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="client.h">
-			</File>
-			<File
-				RelativePath="net.h">
-			</File>
-			<File
-				RelativePath="net_dgrm.h">
-			</File>
-			<File
-				RelativePath="net_loop.h">
-			</File>
-			<File
-				RelativePath="net_udp.h">
-			</File>
-			<File
-				RelativePath="pr_execprogram.h">
-			</File>
-			<File
-				RelativePath="progdefs.h">
-			</File>
-			<File
-				RelativePath="progs.h">
-			</File>
-			<File
-				RelativePath="protocol.h">
-			</File>
-			<File
-				RelativePath="render.h">
-			</File>
-			<File
-				RelativePath="screen.h">
-			</File>
-			<File
-				RelativePath="server.h">
-			</File>
-			<File
-				RelativePath="world.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
+		<File
+			RelativePath="..\twilight.ico">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
Index: twilight/src/qw/qw.vcproj
diff -u twilight/src/qw/qw.vcproj:1.3 twilight/src/qw/qw.vcproj:1.4
--- twilight/src/qw/qw.vcproj:1.3	Tue Mar 16 02:31:57 2004
+++ twilight/src/qw/qw.vcproj	Wed Jan  5 15:33:11 2005
@@ -1,386 +1,613 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.00"

-	Name="qw"

-	SccProjectName=""

-	SccLocalPath="">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"

-				PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Release/qw.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"

-				OutputFile="tw-qw.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="../SDL/lib"

-				IgnoreDefaultLibraryNames="libc.lib"

-				ProgramDatabaseFile=".\Release/tw-qw.pdb"

-				SubSystem="2"/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/qw.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1049"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"

-				PreprocessorDefinitions="_DEBUG,GLQUAKE,WIN32,_WINDOWS"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Debug/qw.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"

-				OutputFile="tw-qw-debug.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="../SDL/lib"

-				IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\Debug/tw-qw-debug.pdb"

-				SubSystem="2"/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/qw.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1049"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-		</Configuration>

-	</Configurations>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath=".\cl_cam.c">

-			</File>

-			<File

-				RelativePath=".\cl_demo.c">

-			</File>

-			<File

-				RelativePath=".\cl_ents.c">

-			</File>

-			<File

-				RelativePath=".\cl_input.c">

-			</File>

-			<File

-				RelativePath=".\cl_main.c">

-			</File>

-			<File

-				RelativePath=".\cl_model.c">

-			</File>

-			<File

-				RelativePath=".\cl_parse.c">

-			</File>

-			<File

-				RelativePath=".\cl_pred.c">

-			</File>

-			<File

-				RelativePath=".\cl_tent.c">

-			</File>

-			<File

-				RelativePath=".\common.c">

-			</File>

-			<File

-				RelativePath=".\console.c">

-			</File>

-			<File

-				RelativePath=".\gl_draw.c">

-			</File>

-			<File

-				RelativePath=".\gl_ngraph.c">

-			</File>

-			<File

-				RelativePath=".\gl_rlight.c">

-			</File>

-			<File

-				RelativePath=".\gl_rmain.c">

-			</File>

-			<File

-				RelativePath=".\gl_rsurf.c">

-			</File>

-			<File

-				RelativePath=".\gl_screen.c">

-			</File>

-			<File

-				RelativePath=".\info.c">

-			</File>

-			<File

-				RelativePath=".\keys.c">

-			</File>

-			<File

-				RelativePath="..\src\base\locs.c">

-			</File>

-			<File

-				RelativePath=".\menu.c">

-			</File>

-			<File

-				RelativePath=".\net_chan.c">

-			</File>

-			<File

-				RelativePath=".\net_udp.c">

-			</File>

-			<File

-				RelativePath=".\pmove.c">

-			</File>

-			<File

-				RelativePath=".\pmovetst.c">

-			</File>

-			<File

-				RelativePath=".\r_explosion.c">

-			</File>

-			<File

-				RelativePath=".\sbar.c">

-			</File>

-			<File

-				RelativePath=".\skin.c">

-			</File>

-			<File

-				RelativePath=".\snd_dma.c">

-			</File>

-			<File

-				RelativePath=".\sv_null.c">

-			</File>

-			<File

-				RelativePath=".\sys.c">

-			</File>

-			<File

-				RelativePath=".\teamplay.c">

-			</File>

-			<File

-				RelativePath=".\vid_sdl.c">

-			</File>

-			<File

-				RelativePath=".\view.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\include\TGL_defines.h">

-			</File>

-			<File

-				RelativePath="..\include\TGL_funcs.h">

-			</File>

-			<File

-				RelativePath="..\include\TGL_funcs_list.h">

-			</File>

-			<File

-				RelativePath="..\include\TGL_types.h">

-			</File>

-			<File

-				RelativePath="..\include\anorm_dots.h">

-			</File>

-			<File

-				RelativePath="..\include\anorms.h">

-			</File>

-			<File

-				RelativePath="..\include\bothdefs.h">

-			</File>

-			<File

-				RelativePath=".\bspfile.h">

-			</File>

-			<File

-				RelativePath=".\client.h">

-			</File>

-			<File

-				RelativePath="..\include\cmd.h">

-			</File>

-			<File

-				RelativePath="..\include\common.h">

-			</File>

-			<File

-				RelativePath="..\include\compat.h">

-			</File>

-			<File

-				RelativePath=".\console.h">

-			</File>

-			<File

-				RelativePath="..\include\crc.h">

-			</File>

-			<File

-				RelativePath="..\include\cvar.h">

-			</File>

-			<File

-				RelativePath="..\include\draw.h">

-			</File>

-			<File

-				RelativePath=".\gl_poly.h">

-			</File>

-			<File

-				RelativePath="..\include\gl_warp_sin.h">

-			</File>

-			<File

-				RelativePath=".\hash.h">

-			</File>

-			<File

-				RelativePath="..\include\host.h">

-			</File>

-			<File

-				RelativePath="..\include\input.h">

-			</File>

-			<File

-				RelativePath=".\keys.h">

-			</File>

-			<File

-				RelativePath="..\include\mathlib.h">

-			</File>

-			<File

-				RelativePath="..\include\mdfour.h">

-			</File>

-			<File

-				RelativePath="..\include\menu.h">

-			</File>

-			<File

-				RelativePath="..\include\modelgen.h">

-			</File>

-			<File

-				RelativePath=".\net.h">

-			</File>

-			<File

-				RelativePath="..\include\pcx.h">

-			</File>

-			<File

-				RelativePath="..\include\pmove.h">

-			</File>

-			<File

-				RelativePath="..\include\pr_comp.h">

-			</File>

-			<File

-				RelativePath=".\protocol.h">

-			</File>

-			<File

-				RelativePath="..\include\qtypes.h">

-			</File>

-			<File

-				RelativePath=".\r_explosion.h">

-			</File>

-			<File

-				RelativePath=".\render.h">

-			</File>

-			<File

-				RelativePath="..\include\sbar.h">

-			</File>

-			<File

-				RelativePath=".\screen.h">

-			</File>

-			<File

-				RelativePath="..\include\sound.h">

-			</File>

-			<File

-				RelativePath="..\include\spritegn.h">

-			</File>

-			<File

-				RelativePath="..\include\strlib.h">

-			</File>

-			<File

-				RelativePath="..\include\tga.h">

-			</File>

-			<File

-				RelativePath="..\include\vid.h">

-			</File>

-			<File

-				RelativePath="..\include\view.h">

-			</File>

-			<File

-				RelativePath="..\include\wad.h">

-			</File>

-			<File

-				RelativePath="..\include\win32config.h">

-			</File>

-			<File

-				RelativePath="..\include\zone.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="qw"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="_DEBUG;GLQUAKE;WIN32;_WINDOWS;HAVE_SDL_H;WANT_CLIENTS;WANT_SERVERS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/qw.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+				OutputFile="../../tw-qw-debug.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../SDL/lib"
+				IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/tw-qw-debug.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/qw.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1049"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;HAVE_SDL_H;WANT_CLIENTS;WANT_SERVERS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/qw.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+				OutputFile="../../tw-qw.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../SDL/lib"
+				IgnoreDefaultLibraryNames="libc.lib"
+				ProgramDatabaseFile=".\Release/tw-qw.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/qw.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1049"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="cl_cam.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_demo.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_ents.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_input.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_main.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_model.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_parse.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_pred.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cl_tent.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="common.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="gl_screen.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="info.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="menu.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="net_chan.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="net_udp.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pmove.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pmovetst.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="skin.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="snd_dma.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_null.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sys.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\twilight.rc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="view.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: twilight/src/qw/qwsv.vcproj
diff -u twilight/src/qw/qwsv.vcproj:1.3 twilight/src/qw/qwsv.vcproj:1.4
--- twilight/src/qw/qwsv.vcproj:1.3	Tue Mar 16 02:31:57 2004
+++ twilight/src/qw/qwsv.vcproj	Wed Jan  5 15:33:11 2005
@@ -1,243 +1,605 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.00"

-	Name="qwsv"

-	SccProjectName=""

-	SccLocalPath="">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="../include,../SDL/include,../src/renderer"

-				PreprocessorDefinitions="_DEBUG,WIN32"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Debug/qwsv.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="wsock32.lib sdl.lib"

-				OutputFile="tw-qwsv-debug.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="../SDL/lib"

-				IgnoreDefaultLibraryNames="libcd"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\Debug/tw-qwsv-debug.pdb"

-				SubSystem="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/qwsv.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="../include,../SDL/include,../src/renderer"

-				PreprocessorDefinitions="NDEBUG,WIN32"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Release/qwsv.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="wsock32.lib sdl.lib"

-				OutputFile="tw-qwsv.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="../SDL/lib"

-				IgnoreDefaultLibraryNames="libc"

-				ProgramDatabaseFile=".\Release/tw-qwsv.pdb"

-				SubSystem="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/qwsv.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-		</Configuration>

-	</Configurations>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath=".\cl_null.c">

-			</File>

-			<File

-				RelativePath=".\common.c">

-			</File>

-			<File

-				RelativePath=".\info.c">

-			</File>

-			<File

-				RelativePath=".\net_chan.c">

-			</File>

-			<File

-				RelativePath=".\net_udp.c">

-			</File>

-			<File

-				RelativePath=".\pmove.c">

-			</File>

-			<File

-				RelativePath=".\pmovetst.c">

-			</File>

-			<File

-				RelativePath=".\pr_cmds.c">

-			</File>

-			<File

-				RelativePath=".\pr_edict.c">

-			</File>

-			<File

-				RelativePath=".\pr_exec.c">

-			</File>

-			<File

-				RelativePath=".\sv_ccmds.c">

-			</File>

-			<File

-				RelativePath=".\sv_ents.c">

-			</File>

-			<File

-				RelativePath=".\sv_init.c">

-			</File>

-			<File

-				RelativePath=".\sv_main.c">

-			</File>

-			<File

-				RelativePath=".\sv_model.c">

-			</File>

-			<File

-				RelativePath=".\sv_move.c">

-			</File>

-			<File

-				RelativePath=".\sv_nchan.c">

-			</File>

-			<File

-				RelativePath=".\sv_phys.c">

-			</File>

-			<File

-				RelativePath=".\sv_send.c">

-			</File>

-			<File

-				RelativePath=".\sv_sys.c">

-			</File>

-			<File

-				RelativePath=".\sv_user.c">

-			</File>

-			<File

-				RelativePath=".\world.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath=".\client.h">

-			</File>

-			<File

-				RelativePath=".\console.h">

-			</File>

-			<File

-				RelativePath=".\keys.h">

-			</File>

-			<File

-				RelativePath=".\net.h">

-			</File>

-			<File

-				RelativePath=".\progdefs.h">

-			</File>

-			<File

-				RelativePath=".\progs.h">

-			</File>

-			<File

-				RelativePath=".\protocol.h">

-			</File>

-			<File

-				RelativePath=".\r_explosion.h">

-			</File>

-			<File

-				RelativePath=".\render.h">

-			</File>

-			<File

-				RelativePath=".\screen.h">

-			</File>

-			<File

-				RelativePath=".\server.h">

-			</File>

-			<File

-				RelativePath=".\world.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="qwsv"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="NDEBUG;WIN32;HAVE_SDL_H;WANT_CLIENTS;WANT_SERVERS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/qwsv.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+				OutputFile="../../tw-qwsv.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../SDL/lib"
+				IgnoreDefaultLibraryNames="libc"
+				ProgramDatabaseFile=".\Release/tw-qwsv.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/qwsv.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
+				PreprocessorDefinitions="_DEBUG;WIN32;HAVE_SDL_H;WANT_CLIENTS;WANT_SERVERS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/qwsv.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+				OutputFile="../../tw-qwsv-debug.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../SDL/lib"
+				IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/tw-qwsv-debug.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/qwsv.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="cl_null.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="common.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="info.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="net_chan.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="net_udp.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pmove.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pmovetst.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pr_cmds.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pr_edict.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pr_exec.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_ccmds.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_ents.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_init.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_main.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_model.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_move.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_nchan.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_phys.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_send.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_sys.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sv_user.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\twilight.rc">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="\CVS\twilight\twilight\src"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="world.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: twilight/src/renderer/twilight_renderer.vcproj
diff -u twilight/src/renderer/twilight_renderer.vcproj:1.5 twilight/src/renderer/twilight_renderer.vcproj:1.6
--- twilight/src/renderer/twilight_renderer.vcproj:1.5	Tue Mar 16 02:31:58 2004
+++ twilight/src/renderer/twilight_renderer.vcproj	Wed Jan  5 15:33:12 2005
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include,../client,../image,../sound,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -71,8 +71,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../client,../image,../sound,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../base,../client,../fs,../image,../include,../renderer,../sound"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -120,7 +119,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="dyngl.c">
+				RelativePath="alias.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -140,10 +139,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\entities.c">
-			</File>
-			<File
-				RelativePath="gen_textures.c">
+				RelativePath="brush.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -163,7 +159,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gl_alias.c">
+				RelativePath="draw.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -183,7 +179,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gl_arrays.c">
+				RelativePath="dyngl.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -203,13 +199,47 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gl_brush.c">
+				RelativePath="entities.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gl_draw.c">
+				RelativePath="explosion.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gl_info.c">
+				RelativePath="gen_textures.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -229,16 +259,67 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gl_light.c">
+				RelativePath="gl_arrays.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gl_main.c">
+				RelativePath="gl_info.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gl_sprite.c">
+				RelativePath="gl_light.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gl_textures.c">
+				RelativePath="gl_main.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -278,7 +359,24 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\menu.c">
+				RelativePath="menu.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="mod_alias.c">
@@ -361,7 +459,24 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\palette.c">
+				RelativePath="palette.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="pointers.c">
@@ -384,9 +499,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\r_explosion.c">
-			</File>
-			<File
 				RelativePath="r_part.c">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -427,7 +539,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="surface.c">
+				RelativePath="sprite.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -447,10 +559,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\video.c">
-			</File>
-			<File
-				RelativePath="vis.c">
+				RelativePath="surface.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -469,87 +578,65 @@
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="dglfuncs.h">
-			</File>
-			<File
-				RelativePath="dyngl.h">
-			</File>
-			<File
-				RelativePath=".\entities.h">
-			</File>
-			<File
-				RelativePath="gen_textures.h">
-			</File>
-			<File
-				RelativePath="gl_alias.h">
-			</File>
-			<File
-				RelativePath="gl_arrays.h">
-			</File>
-			<File
-				RelativePath=".\gl_brush.h">
-			</File>
-			<File
-				RelativePath=".\gl_draw.h">
-			</File>
-			<File
-				RelativePath="gl_info.h">
-			</File>
-			<File
-				RelativePath=".\gl_light.h">
-			</File>
-			<File
-				RelativePath=".\gl_main.h">
-			</File>
-			<File
-				RelativePath=".\gl_sprite.h">
-			</File>
-			<File
-				RelativePath="gl_textures.h">
-			</File>
-			<File
-				RelativePath="light.h">
-			</File>
-			<File
-				RelativePath="liquid.h">
-			</File>
-			<File
-				RelativePath="mod_alias.h">
-			</File>
-			<File
-				RelativePath="mod_alias_disk.h">
-			</File>
-			<File
-				RelativePath="mod_sprite.h">
-			</File>
-			<File
-				RelativePath="mod_sprite_disk.h">
-			</File>
-			<File
-				RelativePath=".\palette.h">
-			</File>
-			<File
-				RelativePath="pointers.h">
-			</File>
-			<File
-				RelativePath="r_part.h">
-			</File>
-			<File
-				RelativePath="sky.h">
-			</File>
 			<File
-				RelativePath="surface.h">
+				RelativePath="textures.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\video.h">
+				RelativePath="video.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="vis.h">
+				RelativePath="vis.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
Index: twilight/src/sound/twilight_sound.vcproj
diff -u twilight/src/sound/twilight_sound.vcproj:1.3 twilight/src/sound/twilight_sound.vcproj:1.4
--- twilight/src/sound/twilight_sound.vcproj:1.3	Tue Mar 16 02:31:58 2004
+++ twilight/src/sound/twilight_sound.vcproj	Wed Jan  5 15:33:12 2005
@@ -21,11 +21,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="../include,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../include,../base"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_SDL_H"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release/twilight_sound.pch"
@@ -72,10 +71,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include,../../../SDL/include"
+				AdditionalIncludeDirectories="../,../include,../base"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_SDL_H"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug/twilight_sound.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -200,16 +199,6 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="cdaudio.h">
-			</File>
-			<File
-				RelativePath="sound.h">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
Index: twilight/twilight.sln
diff -u twilight/twilight.sln:1.3 twilight/twilight.sln:1.4
--- twilight/twilight.sln:1.3	Tue Mar 16 02:31:57 2004
+++ twilight/twilight.sln	Wed Jan  5 15:33:11 2005
@@ -1,30 +1,55 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "src\nq\nq.vcproj", "{58855A69-FFAB-4A2F-8A6F-BDBDD1B34C1A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lhbin2c", "src\tools\lhbin2c.vcproj", "{34D0235D-8D09-4986-A3E9-DD3742991B14}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7} = {6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}
-		{F22C824B-34B7-4EC7-974C-804E21B0A422} = {F22C824B-34B7-4EC7-974C-804E21B0A422}
-		{A8EAA17D-B423-4B59-869F-B9D1AFCFE448} = {A8EAA17D-B423-4B59-869F-B9D1AFCFE448}
-		{084C867F-9D8B-4856-A50E-AD0A44CC614D} = {084C867F-9D8B-4856-A50E-AD0A44CC614D}
-		{996BE59D-1460-48E3-A189-0423E78699FF} = {996BE59D-1460-48E3-A189-0423E78699FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_base", "src\base\twilight_base.vcproj", "{F22C824B-34B7-4EC7-974C-804E21B0A422}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "src\nq\nq.vcproj", "{CC57BEDA-4EE7-4BED-B9D5-F99C5EB7265F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44} = {BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}
+		{D30601C8-1315-4140-8A45-553512680470} = {D30601C8-1315-4140-8A45-553512680470}
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB} = {E090B1A9-C68E-4FC8-B727-A6308D4205FB}
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0} = {88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}
+		{5D648465-1D65-4C13-8359-A67BD545C007} = {5D648465-1D65-4C13-8359-A67BD545C007}
+		{2150F80F-2C50-46ED-B2CF-462106110818} = {2150F80F-2C50-46ED-B2CF-462106110818}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_image", "src\image\twilight_image.vcproj", "{084C867F-9D8B-4856-A50E-AD0A44CC614D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "src\qw\qw.vcproj", "{5965B18B-A705-4BE1-A9E6-EB85B1E5A2A2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44} = {BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}
+		{D30601C8-1315-4140-8A45-553512680470} = {D30601C8-1315-4140-8A45-553512680470}
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB} = {E090B1A9-C68E-4FC8-B727-A6308D4205FB}
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0} = {88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}
+		{5D648465-1D65-4C13-8359-A67BD545C007} = {5D648465-1D65-4C13-8359-A67BD545C007}
+		{2150F80F-2C50-46ED-B2CF-462106110818} = {2150F80F-2C50-46ED-B2CF-462106110818}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_renderer", "src\renderer\twilight_renderer.vcproj", "{996BE59D-1460-48E3-A189-0423E78699FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qwsv", "src\qw\qwsv.vcproj", "{B8566B8F-15C1-426D-BA13-0B66828D6659}"
 	ProjectSection(ProjectDependencies) = postProject
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44} = {BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}
+		{2150F80F-2C50-46ED-B2CF-462106110818} = {2150F80F-2C50-46ED-B2CF-462106110818}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_sound", "src\sound\twilight_sound.vcproj", "{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_base", "src\base\twilight_base.vcproj", "{2150F80F-2C50-46ED-B2CF-462106110818}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_client", "src\client\twilight_client.vcproj", "{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_client", "src\client\twilight_client.vcproj", "{D30601C8-1315-4140-8A45-553512680470}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_fs", "src\fs\twilight_fs.vcproj", "{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_image", "src\image\twilight_image.vcproj", "{E090B1A9-C68E-4FC8-B727-A6308D4205FB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_renderer", "src\renderer\twilight_renderer.vcproj", "{5D648465-1D65-4C13-8359-A67BD545C007}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_sound", "src\sound\twilight_sound.vcproj", "{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -34,30 +59,46 @@
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{58855A69-FFAB-4A2F-8A6F-BDBDD1B34C1A}.Debug.ActiveCfg = Debug|Win32
-		{58855A69-FFAB-4A2F-8A6F-BDBDD1B34C1A}.Debug.Build.0 = Debug|Win32
-		{58855A69-FFAB-4A2F-8A6F-BDBDD1B34C1A}.Release.ActiveCfg = Release|Win32
-		{58855A69-FFAB-4A2F-8A6F-BDBDD1B34C1A}.Release.Build.0 = Release|Win32
-		{F22C824B-34B7-4EC7-974C-804E21B0A422}.Debug.ActiveCfg = Debug|Win32
-		{F22C824B-34B7-4EC7-974C-804E21B0A422}.Debug.Build.0 = Debug|Win32
-		{F22C824B-34B7-4EC7-974C-804E21B0A422}.Release.ActiveCfg = Release|Win32
-		{F22C824B-34B7-4EC7-974C-804E21B0A422}.Release.Build.0 = Release|Win32
-		{084C867F-9D8B-4856-A50E-AD0A44CC614D}.Debug.ActiveCfg = Debug|Win32
-		{084C867F-9D8B-4856-A50E-AD0A44CC614D}.Debug.Build.0 = Debug|Win32
-		{084C867F-9D8B-4856-A50E-AD0A44CC614D}.Release.ActiveCfg = Release|Win32
-		{084C867F-9D8B-4856-A50E-AD0A44CC614D}.Release.Build.0 = Release|Win32
-		{996BE59D-1460-48E3-A189-0423E78699FF}.Debug.ActiveCfg = Debug|Win32
-		{996BE59D-1460-48E3-A189-0423E78699FF}.Debug.Build.0 = Debug|Win32
-		{996BE59D-1460-48E3-A189-0423E78699FF}.Release.ActiveCfg = Release|Win32
-		{996BE59D-1460-48E3-A189-0423E78699FF}.Release.Build.0 = Release|Win32
-		{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}.Debug.ActiveCfg = Debug|Win32
-		{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}.Debug.Build.0 = Debug|Win32
-		{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}.Release.ActiveCfg = Release|Win32
-		{6BCDC134-3BC5-4713-B4DF-1C4C2BB73BE7}.Release.Build.0 = Release|Win32
-		{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}.Debug.ActiveCfg = Debug|Win32
-		{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}.Debug.Build.0 = Debug|Win32
-		{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}.Release.ActiveCfg = Release|Win32
-		{A8EAA17D-B423-4B59-869F-B9D1AFCFE448}.Release.Build.0 = Release|Win32
+		{34D0235D-8D09-4986-A3E9-DD3742991B14}.Debug.ActiveCfg = Debug|Win32
+		{34D0235D-8D09-4986-A3E9-DD3742991B14}.Debug.Build.0 = Debug|Win32
+		{34D0235D-8D09-4986-A3E9-DD3742991B14}.Release.ActiveCfg = Release|Win32
+		{34D0235D-8D09-4986-A3E9-DD3742991B14}.Release.Build.0 = Release|Win32
+		{CC57BEDA-4EE7-4BED-B9D5-F99C5EB7265F}.Debug.ActiveCfg = Debug|Win32
+		{CC57BEDA-4EE7-4BED-B9D5-F99C5EB7265F}.Debug.Build.0 = Debug|Win32
+		{CC57BEDA-4EE7-4BED-B9D5-F99C5EB7265F}.Release.ActiveCfg = Release|Win32
+		{CC57BEDA-4EE7-4BED-B9D5-F99C5EB7265F}.Release.Build.0 = Release|Win32
+		{5965B18B-A705-4BE1-A9E6-EB85B1E5A2A2}.Debug.ActiveCfg = Debug|Win32
+		{5965B18B-A705-4BE1-A9E6-EB85B1E5A2A2}.Debug.Build.0 = Debug|Win32
+		{5965B18B-A705-4BE1-A9E6-EB85B1E5A2A2}.Release.ActiveCfg = Release|Win32
+		{5965B18B-A705-4BE1-A9E6-EB85B1E5A2A2}.Release.Build.0 = Release|Win32
+		{B8566B8F-15C1-426D-BA13-0B66828D6659}.Debug.ActiveCfg = Debug|Win32
+		{B8566B8F-15C1-426D-BA13-0B66828D6659}.Debug.Build.0 = Debug|Win32
+		{B8566B8F-15C1-426D-BA13-0B66828D6659}.Release.ActiveCfg = Release|Win32
+		{B8566B8F-15C1-426D-BA13-0B66828D6659}.Release.Build.0 = Release|Win32
+		{2150F80F-2C50-46ED-B2CF-462106110818}.Debug.ActiveCfg = Debug|Win32
+		{2150F80F-2C50-46ED-B2CF-462106110818}.Debug.Build.0 = Debug|Win32
+		{2150F80F-2C50-46ED-B2CF-462106110818}.Release.ActiveCfg = Release|Win32
+		{2150F80F-2C50-46ED-B2CF-462106110818}.Release.Build.0 = Release|Win32
+		{D30601C8-1315-4140-8A45-553512680470}.Debug.ActiveCfg = Debug|Win32
+		{D30601C8-1315-4140-8A45-553512680470}.Debug.Build.0 = Debug|Win32
+		{D30601C8-1315-4140-8A45-553512680470}.Release.ActiveCfg = Release|Win32
+		{D30601C8-1315-4140-8A45-553512680470}.Release.Build.0 = Release|Win32
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}.Debug.ActiveCfg = Debug|Win32
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}.Debug.Build.0 = Debug|Win32
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}.Release.ActiveCfg = Release|Win32
+		{BED2A0D0-3020-48BC-A9EA-31B7CE5C9F44}.Release.Build.0 = Release|Win32
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB}.Debug.ActiveCfg = Debug|Win32
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB}.Debug.Build.0 = Debug|Win32
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB}.Release.ActiveCfg = Release|Win32
+		{E090B1A9-C68E-4FC8-B727-A6308D4205FB}.Release.Build.0 = Release|Win32
+		{5D648465-1D65-4C13-8359-A67BD545C007}.Debug.ActiveCfg = Debug|Win32
+		{5D648465-1D65-4C13-8359-A67BD545C007}.Debug.Build.0 = Debug|Win32
+		{5D648465-1D65-4C13-8359-A67BD545C007}.Release.ActiveCfg = Release|Win32
+		{5D648465-1D65-4C13-8359-A67BD545C007}.Release.Build.0 = Release|Win32
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}.Debug.ActiveCfg = Debug|Win32
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}.Debug.Build.0 = Debug|Win32
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}.Release.ActiveCfg = Release|Win32
+		{88FE9DC4-BF48-4674-8AD9-B0512A5B77D0}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection


More information about the twilight-commits mailing list