From 1cb4fa386ac023c1bda92c324250eec03a571271 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Sun, 12 Mar 2006 04:33:22 +0000
Subject: [PATCH] fix warning, fix building of direct3d on msvc8, update
 project

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2089 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/cl_main.c           | 2 +-
 engine/dotnet2005/ftequake.vcproj | 4 ++--
 engine/gl/gltod3d/gl_fakegl.cpp   | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 59d315848..a697dc119 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -1002,7 +1002,7 @@ This is also called on Host_Error, so it shouldn't cause any errors
 */
 void CL_Disconnect (void)
 {
-	qbyte	final[10];
+	qbyte	final[12];
 
 	connect_time = -1;
 
diff --git a/engine/dotnet2005/ftequake.vcproj b/engine/dotnet2005/ftequake.vcproj
index 5950cd715..fe821b89b 100644
--- a/engine/dotnet2005/ftequake.vcproj
+++ b/engine/dotnet2005/ftequake.vcproj
@@ -764,7 +764,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\client,../libs/dxsdk7/include,../common,../server,../gl,../sw,../qclib,../libs"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;GLQUAKE;SWQUAKE;USE_D3D"
 				StringPooling="true"
@@ -1175,7 +1175,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\client,../libs/dxsdk7/include,../common,../server,../gl,../sw,../qclib,../libs"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;GLQUAKE;SWQUAKE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;GLQUAKE;SWQUAKE;USE_D3D"
 				RuntimeLibrary="1"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="2"
diff --git a/engine/gl/gltod3d/gl_fakegl.cpp b/engine/gl/gltod3d/gl_fakegl.cpp
index de748e259..b3306a22f 100644
--- a/engine/gl/gltod3d/gl_fakegl.cpp
+++ b/engine/gl/gltod3d/gl_fakegl.cpp
@@ -53,7 +53,10 @@ the fact that it uses wrapper functions to call methods in a class could be a re
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4820 )
 
+#if (_MSC_VER < 1400)
 #define     D3D_OVERLOADS
+#endif
+
 #define     RELEASENULL(object) if (object) {object->Release();}
 
 #include    "ddraw.h"
@@ -922,7 +925,7 @@ public:
 		}
 	}
 
-	inline IsMergableMode(GLenum /* mode */){
+	inline bool IsMergableMode(GLenum /* mode */){
 		CheckFlush();
 		return true;
 	}