eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

fix warning, fix building of direct3d on msvc8, update project

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2089 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-03-12 04:33:22 +00:00
parent f0c399ff9e
commit 1cb4fa386a
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -1002,7 +1002,7 @@ This is also called on Host_Error, so it shouldn't cause any errors
*/ */
void CL_Disconnect (void) void CL_Disconnect (void)
{ {
qbyte final[10]; qbyte final[12];
connect_time = -1; connect_time = -1;

4
engine/dotnet2005/ftequake.vcproj
View file

@ -764,7 +764,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\client,../libs/dxsdk7/include,../common,../server,../gl,../sw,../qclib,../libs" AdditionalIncludeDirectories="..\client,../libs/dxsdk7/include,../common,../server,../gl,../sw,../qclib,../libs"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;GLQUAKE;SWQUAKE;USE_D3D" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;GLQUAKE;SWQUAKE;USE_D3D"
StringPooling="true" StringPooling="true"
@ -1175,7 +1175,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\client,../libs/dxsdk7/include,../common,../server,../gl,../sw,../qclib,../libs" 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" RuntimeLibrary="1"
FloatingPointModel="2" FloatingPointModel="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"

5
engine/gl/gltod3d/gl_fakegl.cpp
View file

@ -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 : 4244 )
#pragma warning( disable : 4820 ) #pragma warning( disable : 4820 )
#if (_MSC_VER < 1400)
#define D3D_OVERLOADS #define D3D_OVERLOADS
#endif
#define RELEASENULL(object) if (object) {object->Release();} #define RELEASENULL(object) if (object) {object->Release();}
#include "ddraw.h" #include "ddraw.h"
@ -922,7 +925,7 @@ public:
} }
} }
inline IsMergableMode(GLenum /* mode */){ inline bool IsMergableMode(GLenum /* mode */){
CheckFlush(); CheckFlush();
return true; return true;
} }