1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged Multi Player Project into main branch

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-05-12 08:20:47 +00:00
parent c448713412
commit 3e22dce318
132 changed files with 14527 additions and 4859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/SGP_2005Express.vcproj
+3 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Version="8.00"
Name="SGP_2005Express"
ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
RootNamespace="SGP_2005Express"
@@ -41,6 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -104,6 +105,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
Standard Gaming Platform/Standard Gaming Platform.vcproj
+1 -1
View File
@@ -330,7 +330,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Res;..\Build;..\TileEngine;..\Tactical;..\Utils;..\lua;..\strategic;..\Console;..\;.\"
AdditionalIncludeDirectories="..\Multiplayer;..\Res;..\Build;..\TileEngine;..\Tactical;..\Utils;..\lua;..\strategic;..\Console;..\;.\"
PreprocessorDefinitions="JA2_PRECOMPILED_HEADERS;NO_ZLIB_COMPRESSION;_DEBUG;WIN32;_WINDOWS;JA2;_VTUNE_PROFILING;XML_STATIC;CINTERFACE"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
Standard Gaming Platform/sgp.cpp
+36 -36
View File
@@ -386,25 +386,25 @@ INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LP
}
break;
case FALSE: // We are suspending direct draw
#ifdef JA2
// pause the JA2 Global clock
PauseTime( TRUE );
SuspendVideoManager();
#else
#ifndef UTIL
if(!VideoInspectorIsEnabled())
SuspendVideoManager();
#endif
#endif
// suspend movement timer, to prevent timer crash if delay becomes long
// * it doesn't matter whether the 3-D engine is actually running or not, or if it's even been initialized
// * restore is automatic, no need to do anything on reactivation
#if !defined( JA2 ) && !defined( UTIL )
MoveTimer(TIMER_SUSPEND);
#endif
gfApplicationActive = FALSE;
fRestore = TRUE;
//#ifdef JA2
// // pause the JA2 Global clock
// PauseTime( TRUE );
// SuspendVideoManager();
//#else
//#ifndef UTIL
// if(!VideoInspectorIsEnabled())
// SuspendVideoManager();
//#endif
//#endif
// // suspend movement timer, to prevent timer crash if delay becomes long
// // * it doesn't matter whether the 3-D engine is actually running or not, or if it's even been initialized
// // * restore is automatic, no need to do anything on reactivation
//#if !defined( JA2 ) && !defined( UTIL )
// MoveTimer(TIMER_SUSPEND);
//#endif
//
// gfApplicationActive = FALSE;
// fRestore = TRUE;
break;
}
break;
@@ -419,27 +419,27 @@ INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LP
break;
case WM_SETFOCUS:
#if !defined( JA2 ) && !defined( UTIL )
if(!VideoInspectorIsEnabled())
RestoreVideoManager();
gfApplicationActive=TRUE;
// RestrictMouseToXYXY(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
#else
RestoreCursorClipRect( );
#endif
//#if !defined( JA2 ) && !defined( UTIL )
// if(!VideoInspectorIsEnabled())
// RestoreVideoManager();
// gfApplicationActive=TRUE;
//// RestrictMouseToXYXY(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
//#else
// RestoreCursorClipRect( );
//#endif
break;
case WM_KILLFOCUS:
#if !defined( JA2 ) && !defined( UTIL )
if(!VideoInspectorIsEnabled())
SuspendVideoManager();
gfApplicationActive=FALSE;
FreeMouseCursor();
#endif
// Set a flag to restore surfaces once a WM_ACTIVEATEAPP is received
fRestore = TRUE;
//#if !defined( JA2 ) && !defined( UTIL )
// if(!VideoInspectorIsEnabled())
// SuspendVideoManager();
//
// gfApplicationActive=FALSE;
// FreeMouseCursor();
//#endif
// // Set a flag to restore surfaces once a WM_ACTIVEATEAPP is received
// fRestore = TRUE;
break;