1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Browse Source
This commit is contained in:
Overhaul
2007-06-29 10:40:05 +00:00
parent dc441a425d
commit e6024e5151
46 changed files with 4912 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor_2005Express.vcproj
+366
View File
@@ -0,0 +1,366 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="Editor_2005Express"
ProjectGUID="{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
RootNamespace="Editor_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Button Defines.h"
>
</File>
<File
RelativePath=".\Cursor Modes.h"
>
</File>
<File
RelativePath=".\edit_sys.h"
>
</File>
<File
RelativePath=".\Editor All.h"
>
</File>
<File
RelativePath=".\Editor Callback Prototypes.h"
>
</File>
<File
RelativePath=".\Editor Modes.h"
>
</File>
<File
RelativePath=".\Editor Taskbar Creation.h"
>
</File>
<File
RelativePath=".\Editor Taskbar Utils.h"
>
</File>
<File
RelativePath=".\Editor Undo.h"
>
</File>
<File
RelativePath=".\EditorBuildings.h"
>
</File>
<File
RelativePath=".\EditorDefines.h"
>
</File>
<File
RelativePath=".\EditorItems.h"
>
</File>
<File
RelativePath=".\EditorMapInfo.h"
>
</File>
<File
RelativePath=".\EditorMercs.h"
>
</File>
<File
RelativePath=".\EditorTerrain.h"
>
</File>
<File
RelativePath=".\editscreen.h"
>
</File>
<File
RelativePath=".\Item Statistics.h"
>
</File>
<File
RelativePath=".\LoadScreen.h"
>
</File>
<File
RelativePath=".\messagebox.h"
>
</File>
<File
RelativePath=".\newsmooth.h"
>
</File>
<File
RelativePath=".\popupmenu.h"
>
</File>
<File
RelativePath=".\Road Smoothing.h"
>
</File>
<File
RelativePath=".\Sector Summary.h"
>
</File>
<File
RelativePath=".\selectwin.h"
>
</File>
<File
RelativePath=".\SmartMethod.h"
>
</File>
<File
RelativePath=".\smooth.h"
>
</File>
<File
RelativePath=".\Smoothing Utils.h"
>
</File>
<File
RelativePath=".\Summary Info.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Cursor Modes.cpp"
>
</File>
<File
RelativePath=".\edit_sys.cpp"
>
</File>
<File
RelativePath=".\Editor Callbacks.cpp"
>
</File>
<File
RelativePath=".\Editor Modes.cpp"
>
</File>
<File
RelativePath=".\Editor Taskbar Creation.cpp"
>
</File>
<File
RelativePath=".\Editor Taskbar Utils.cpp"
>
</File>
<File
RelativePath=".\Editor Undo.cpp"
>
</File>
<File
RelativePath=".\EditorBuildings.cpp"
>
</File>
<File
RelativePath=".\EditorItems.cpp"
>
</File>
<File
RelativePath=".\EditorMapInfo.cpp"
>
</File>
<File
RelativePath=".\EditorMercs.cpp"
>
</File>
<File
RelativePath=".\EditorTerrain.cpp"
>
</File>
<File
RelativePath=".\editscreen.cpp"
>
</File>
<File
RelativePath=".\Item Statistics.cpp"
>
</File>
<File
RelativePath=".\LoadScreen.cpp"
>
</File>
<File
RelativePath=".\messagebox.cpp"
>
</File>
<File
RelativePath=".\newsmooth.cpp"
>
</File>
<File
RelativePath=".\popupmenu.cpp"
>
</File>
<File
RelativePath=".\Road Smoothing.cpp"
>
</File>
<File
RelativePath=".\Sector Summary.cpp"
>
</File>
<File
RelativePath=".\selectwin.cpp"
>
</File>
<File
RelativePath=".\SmartMethod.cpp"
>
</File>
<File
RelativePath=".\smooth.cpp"
>
</File>
<File
RelativePath=".\Smoothing Utils.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Laptop/Laptop_2005Express.vcproj
+634
View File
@@ -0,0 +1,634 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="Laptop_2005Express"
ProjectGUID="{5234CD2E-97F1-42FF-828D-CE0A1B46805E}"
RootNamespace="Laptop_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\aim.h"
>
</File>
<File
RelativePath=".\AimArchives.h"
>
</File>
<File
RelativePath=".\AimFacialIndex.h"
>
</File>
<File
RelativePath=".\AimHistory.h"
>
</File>
<File
RelativePath=".\AimLinks.h"
>
</File>
<File
RelativePath=".\AimMembers.h"
>
</File>
<File
RelativePath=".\AimPolicies.h"
>
</File>
<File
RelativePath=".\AimSort.h"
>
</File>
<File
RelativePath=".\BobbyR.h"
>
</File>
<File
RelativePath=".\BobbyRAmmo.h"
>
</File>
<File
RelativePath=".\BobbyRArmour.h"
>
</File>
<File
RelativePath=".\BobbyRGuns.h"
>
</File>
<File
RelativePath=".\BobbyRMailOrder.h"
>
</File>
<File
RelativePath=".\BobbyRMisc.h"
>
</File>
<File
RelativePath=".\BobbyRShipments.h"
>
</File>
<File
RelativePath=".\BobbyRUsed.h"
>
</File>
<File
RelativePath=".\BrokenLink.h"
>
</File>
<File
RelativePath=".\CharProfile.h"
>
</File>
<File
RelativePath=".\email.h"
>
</File>
<File
RelativePath=".\files.h"
>
</File>
<File
RelativePath=".\finances.h"
>
</File>
<File
RelativePath=".\florist Cards.h"
>
</File>
<File
RelativePath=".\florist Gallery.h"
>
</File>
<File
RelativePath=".\florist Order Form.h"
>
</File>
<File
RelativePath=".\florist.h"
>
</File>
<File
RelativePath=".\funeral.h"
>
</File>
<File
RelativePath=".\GunEmporium.h"
>
</File>
<File
RelativePath=".\history.h"
>
</File>
<File
RelativePath=".\IMP AboutUs.h"
>
</File>
<File
RelativePath=".\IMP Attribute Entrance.h"
>
</File>
<File
RelativePath=".\IMP Attribute Finish.h"
>
</File>
<File
RelativePath=".\IMP Attribute Selection.h"
>
</File>
<File
RelativePath=".\IMP Begin Screen.h"
>
</File>
<File
RelativePath=".\IMP Compile Character.h"
>
</File>
<File
RelativePath=".\IMP Confirm.h"
>
</File>
<File
RelativePath=".\IMP Finish.h"
>
</File>
<File
RelativePath=".\IMP HomePage.h"
>
</File>
<File
RelativePath=".\IMP MainPage.h"
>
</File>
<File
RelativePath=".\IMP Personality Entrance.h"
>
</File>
<File
RelativePath=".\IMP Personality Finish.h"
>
</File>
<File
RelativePath=".\IMP Personality Quiz.h"
>
</File>
<File
RelativePath=".\IMP Portraits.h"
>
</File>
<File
RelativePath=".\IMP Skill Trait.h"
>
</File>
<File
RelativePath=".\IMP Text System.h"
>
</File>
<File
RelativePath=".\IMP Voices.h"
>
</File>
<File
RelativePath=".\IMPVideoObjects.h"
>
</File>
<File
RelativePath=".\insurance Comments.h"
>
</File>
<File
RelativePath=".\insurance Contract.h"
>
</File>
<File
RelativePath=".\insurance Info.h"
>
</File>
<File
RelativePath=".\Insurance Text.h"
>
</File>
<File
RelativePath=".\insurance.h"
>
</File>
<File
RelativePath=".\Laptop All.h"
>
</File>
<File
RelativePath=".\laptop.h"
>
</File>
<File
RelativePath=".\LaptopSave.h"
>
</File>
<File
RelativePath=".\mercs Account.h"
>
</File>
<File
RelativePath=".\mercs Files.h"
>
</File>
<File
RelativePath=".\mercs No Account.h"
>
</File>
<File
RelativePath=".\mercs.h"
>
</File>
<File
RelativePath=".\personnel.h"
>
</File>
<File
RelativePath=".\sirtech.h"
>
</File>
<File
RelativePath=".\Speck Quotes.h"
>
</File>
<File
RelativePath=".\Store Inventory.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\aim.cpp"
>
</File>
<File
RelativePath=".\AimArchives.cpp"
>
</File>
<File
RelativePath=".\AimFacialIndex.cpp"
>
</File>
<File
RelativePath=".\AimHistory.cpp"
>
</File>
<File
RelativePath=".\AimLinks.cpp"
>
</File>
<File
RelativePath=".\AimMembers.cpp"
>
</File>
<File
RelativePath=".\AimPolicies.cpp"
>
</File>
<File
RelativePath=".\AimSort.cpp"
>
</File>
<File
RelativePath=".\BobbyR.cpp"
>
</File>
<File
RelativePath=".\BobbyRAmmo.cpp"
>
</File>
<File
RelativePath=".\BobbyRArmour.cpp"
>
</File>
<File
RelativePath=".\BobbyRGuns.cpp"
>
</File>
<File
RelativePath=".\BobbyRMailOrder.cpp"
>
</File>
<File
RelativePath=".\BobbyRMisc.cpp"
>
</File>
<File
RelativePath=".\BobbyRShipments.cpp"
>
</File>
<File
RelativePath=".\BobbyRUsed.cpp"
>
</File>
<File
RelativePath=".\BrokenLink.cpp"
>
</File>
<File
RelativePath=".\CharProfile.cpp"
>
</File>
<File
RelativePath=".\email.cpp"
>
</File>
<File
RelativePath=".\files.cpp"
>
</File>
<File
RelativePath=".\finances.cpp"
>
</File>
<File
RelativePath=".\florist Cards.cpp"
>
</File>
<File
RelativePath=".\florist Gallery.cpp"
>
</File>
<File
RelativePath=".\florist Order Form.cpp"
>
</File>
<File
RelativePath=".\florist.cpp"
>
</File>
<File
RelativePath=".\funeral.cpp"
>
</File>
<File
RelativePath=".\history.cpp"
>
</File>
<File
RelativePath=".\IMP AboutUs.cpp"
>
</File>
<File
RelativePath=".\IMP Attribute Entrance.cpp"
>
</File>
<File
RelativePath=".\IMP Attribute Finish.cpp"
>
</File>
<File
RelativePath=".\IMP Attribute Selection.cpp"
>
</File>
<File
RelativePath=".\IMP Begin Screen.cpp"
>
</File>
<File
RelativePath=".\IMP Compile Character.cpp"
>
</File>
<File
RelativePath=".\IMP Confirm.cpp"
>
</File>
<File
RelativePath=".\IMP Finish.cpp"
>
</File>
<File
RelativePath=".\IMP HomePage.cpp"
>
</File>
<File
RelativePath=".\IMP MainPage.cpp"
>
</File>
<File
RelativePath=".\IMP Personality Entrance.cpp"
>
</File>
<File
RelativePath=".\IMP Personality Finish.cpp"
>
</File>
<File
RelativePath=".\IMP Personality Quiz.cpp"
>
</File>
<File
RelativePath=".\IMP Portraits.cpp"
>
</File>
<File
RelativePath=".\IMP Skill Trait.cpp"
>
</File>
<File
RelativePath=".\IMP Text System.cpp"
>
</File>
<File
RelativePath=".\IMP Voices.cpp"
>
</File>
<File
RelativePath=".\IMPVideoObjects.cpp"
>
</File>
<File
RelativePath=".\insurance Comments.cpp"
>
</File>
<File
RelativePath=".\insurance Contract.cpp"
>
</File>
<File
RelativePath=".\insurance Info.cpp"
>
</File>
<File
RelativePath=".\insurance.cpp"
>
</File>
<File
RelativePath=".\laptop.cpp"
>
</File>
<File
RelativePath=".\mercs Account.cpp"
>
</File>
<File
RelativePath=".\mercs Files.cpp"
>
</File>
<File
RelativePath=".\mercs No Account.cpp"
>
</File>
<File
RelativePath=".\mercs.cpp"
>
</File>
<File
RelativePath=".\personnel.cpp"
>
</File>
<File
RelativePath=".\sirtech.cpp"
>
</File>
<File
RelativePath=".\Store Inventory.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
SaveLoadScreen.cpp
+1 -1
View File
@@ -1511,7 +1511,7 @@ BOOLEAN LoadSavedGameHeader( INT8 bEntry, SAVED_GAME_HEADER *pSaveGameHeader )
} }
else else
{ {
memset( &pSaveGameHeader, 0, sizeof( SAVED_GAME_HEADER ) ); memset( pSaveGameHeader, 0, sizeof( SAVED_GAME_HEADER ) );
#ifdef JA2BETAVERSION #ifdef JA2BETAVERSION
wcscpy( pSaveGameHeader->sSavedGameDesc, L"ERROR loading saved game header, file doesn't exist!!" ); wcscpy( pSaveGameHeader->sSavedGameDesc, L"ERROR loading saved game header, file doesn't exist!!" );
#endif #endif
Standard Gaming Platform/Button System.cpp
+4
View File
@@ -2791,6 +2791,10 @@ void QuickButtonCallbackMButn( MOUSE_REGION *reg, INT32 reason )
{ {
StateAfter = (b->uiFlags & BUTTON_CLICKED_ON) ? (TRUE) : (FALSE); StateAfter = (b->uiFlags & BUTTON_CLICKED_ON) ? (TRUE) : (FALSE);
} }
else
{
StateAfter = !( reason & MSYS_CALLBACK_REASON_LBUTTON_UP );
}
// Play sounds for this enabled button (disabled sounds have already been done) // Play sounds for this enabled button (disabled sounds have already been done)
if( b->ubSoundSchemeID && b->uiFlags & BUTTON_ENABLED ) if( b->ubSoundSchemeID && b->uiFlags & BUTTON_ENABLED )
Standard Gaming Platform/Compression.h
+1 -1
View File
@@ -23,7 +23,7 @@
// //
// 3) call DecompressFini() with the decompression pointer when you're done // 3) call DecompressFini() with the decompression pointer when you're done
PTR DecompressInit( BYTE * pCompressedData, UINT32 uiDataSize ); PTR DecompressInit( PTR pCompressedData, UINT32 uiDataSize );
UINT32 Decompress( PTR pDecompPtr, BYTE * pBuffer, UINT32 uiBufferLen ); UINT32 Decompress( PTR pDecompPtr, BYTE * pBuffer, UINT32 uiBufferLen );
void DecompressFini( PTR pDecompPtr ); void DecompressFini( PTR pDecompPtr );
Standard Gaming Platform/ExceptionHandling.cpp
+1
View File
@@ -7,6 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h> #include <malloc.h>
#include <stdio.h> #include <stdio.h>
#include "FileMan.h"
#endif #endif
#include "ExceptionHandling.h" #include "ExceptionHandling.h"
Standard Gaming Platform/FileCat.cpp
+3 -1
View File
@@ -73,6 +73,8 @@ size_t TFileCat::RemoveDir(std::string dir, bool pathIncludesRoot)
void TFileCat::TraverseDir(std::string dir, int depth) void TFileCat::TraverseDir(std::string dir, int depth)
{ {
using std::string; using std::string;
static string dot( ".");
static string dotdot( "..");
if (!dir.empty()) dir += '\\'; if (!dir.empty()) dir += '\\';
@@ -82,7 +84,7 @@ void TFileCat::TraverseDir(std::string dir, int depth)
unsigned attrib; unsigned attrib;
while ( readDir.NextFile(fileName, attrib) ) { while ( readDir.NextFile(fileName, attrib) ) {
if (string(".") == fileName || string("..") == fileName) continue; if (dot == fileName || dotdot == fileName) continue;
string fullPath = dir + fileName; string fullPath = dir + fileName;
Standard Gaming Platform/SGP_2005Express.vcproj
+566
View File
@@ -0,0 +1,566 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="SGP_2005Express"
ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
RootNamespace="SGP_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Bitmap.h"
>
</File>
<File
RelativePath=".\Button Sound Control.h"
>
</File>
<File
RelativePath=".\Button System.h"
>
</File>
<File
RelativePath=".\Compression.h"
>
</File>
<File
RelativePath=".\Container.h"
>
</File>
<File
RelativePath=".\Cursor Control.h"
>
</File>
<File
RelativePath=".\DbMan.h"
>
</File>
<File
RelativePath=".\ddraw.h"
>
</File>
<File
RelativePath=".\DEBUG.H"
>
</File>
<File
RelativePath=".\DirectDraw Calls.h"
>
</File>
<File
RelativePath=".\DirectX Common.h"
>
</File>
<File
RelativePath=".\dsound.h"
>
</File>
<File
RelativePath=".\english.h"
>
</File>
<File
RelativePath=".\ExceptionHandling.h"
>
</File>
<File
RelativePath=".\expat.h"
>
</File>
<File
RelativePath=".\FileCat.h"
>
</File>
<File
RelativePath=".\FileMan.h"
>
</File>
<File
RelativePath=".\flic.h"
>
</File>
<File
RelativePath=".\fmod.h"
>
</File>
<File
RelativePath=".\fmod_errors.h"
>
</File>
<File
RelativePath=".\Font.h"
>
</File>
<File
RelativePath=".\himage.h"
>
</File>
<File
RelativePath=".\imgfmt.h"
>
</File>
<File
RelativePath=".\impTGA.h"
>
</File>
<File
RelativePath=".\input.h"
>
</File>
<File
RelativePath=".\Install.h"
>
</File>
<File
RelativePath=".\Ja2 Libs.h"
>
</File>
<File
RelativePath=".\JA2 SGP ALL.H"
>
</File>
<File
RelativePath=".\LibraryDataBase.h"
>
</File>
<File
RelativePath=".\line.h"
>
</File>
<File
RelativePath=".\MemMan.h"
>
</File>
<File
RelativePath=".\mousesystem.h"
>
</File>
<File
RelativePath=".\mousesystem_macros.h"
>
</File>
<File
RelativePath=".\Mss-old.h"
>
</File>
<File
RelativePath=".\Mss.h"
>
</File>
<File
RelativePath=".\Mutex Manager.h"
>
</File>
<File
RelativePath=".\pcx.h"
>
</File>
<File
RelativePath=".\RAD.H"
>
</File>
<File
RelativePath=".\random.h"
>
</File>
<File
RelativePath=".\readdir.h"
>
</File>
<File
RelativePath=".\RegInst.h"
>
</File>
<File
RelativePath=".\sgp.h"
>
</File>
<File
RelativePath=".\shading.h"
>
</File>
<File
RelativePath=".\SMACK.H"
>
</File>
<File
RelativePath=".\soundman.h"
>
</File>
<File
RelativePath=".\STCI.h"
>
</File>
<File
RelativePath=".\stringicmp.h"
>
</File>
<File
RelativePath=".\timer.h"
>
</File>
<File
RelativePath=".\TopicIDs.h"
>
</File>
<File
RelativePath=".\TopicOps.h"
>
</File>
<File
RelativePath=".\trle.h"
>
</File>
<File
RelativePath=".\Types.h"
>
</File>
<File
RelativePath=".\video.h"
>
</File>
<File
RelativePath=".\video_private.h"
>
</File>
<File
RelativePath=".\vobject.h"
>
</File>
<File
RelativePath=".\vobject_blitters.h"
>
</File>
<File
RelativePath=".\vobject_private.h"
>
</File>
<File
RelativePath=".\vsurface.h"
>
</File>
<File
RelativePath=".\vsurface_private.h"
>
</File>
<File
RelativePath=".\WCheck.h"
>
</File>
<File
RelativePath=".\WinFont.h"
>
</File>
<File
RelativePath=".\WizShare.h"
>
</File>
<File
RelativePath=".\ZCONF.H"
>
</File>
<File
RelativePath=".\ZLIB.H"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Button Sound Control.cpp"
>
</File>
<File
RelativePath=".\Button System.cpp"
>
</File>
<File
RelativePath=".\Container.cpp"
>
</File>
<File
RelativePath=".\Cursor Control.cpp"
>
</File>
<File
RelativePath=".\DbMan.cpp"
>
</File>
<File
RelativePath=".\DEBUG.cpp"
>
</File>
<File
RelativePath=".\DirectDraw Calls.cpp"
>
</File>
<File
RelativePath=".\DirectX Common.cpp"
>
</File>
<File
RelativePath=".\English.cpp"
>
</File>
<File
RelativePath=".\ExceptionHandling.cpp"
>
</File>
<File
RelativePath=".\FileCat.cpp"
>
</File>
<File
RelativePath=".\FileMan.cpp"
>
</File>
<File
RelativePath=".\Font.cpp"
>
</File>
<File
RelativePath=".\himage.cpp"
>
</File>
<File
RelativePath=".\impTGA.cpp"
>
</File>
<File
RelativePath=".\input.cpp"
>
</File>
<File
RelativePath=".\Install.cpp"
>
</File>
<File
RelativePath=".\LibraryDataBase.cpp"
>
</File>
<File
RelativePath=".\line.cpp"
>
</File>
<File
RelativePath=".\MemMan.cpp"
>
</File>
<File
RelativePath=".\mousesystem.cpp"
>
</File>
<File
RelativePath=".\Mutex Manager.cpp"
>
</File>
<File
RelativePath=".\PCX.cpp"
>
</File>
<File
RelativePath=".\Random.cpp"
>
</File>
<File
RelativePath=".\readdir.cpp"
>
</File>
<File
RelativePath=".\RegInst.cpp"
>
</File>
<File
RelativePath=".\sgp.cpp"
>
</File>
<File
RelativePath=".\shading.cpp"
>
</File>
<File
RelativePath=".\soundman.cpp"
>
</File>
<File
RelativePath=".\STCI.cpp"
>
</File>
<File
RelativePath=".\stringicmp.cpp"
>
</File>
<File
RelativePath=".\timer.cpp"
>
</File>
<File
RelativePath=".\video.cpp"
>
</File>
<File
RelativePath=".\vobject.cpp"
>
</File>
<File
RelativePath=".\vobject_blitters.cpp"
>
</File>
<File
RelativePath=".\vsurface.cpp"
>
</File>
<File
RelativePath=".\WinFont.cpp"
>
</File>
</Filter>
<File
RelativePath=".\ddraw.lib"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Standard Gaming Platform/himage.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ BOOLEAN Copy8BPPCompressedImageTo8BPPBuffer( HIMAGE hImage, BYTE *pDestBuf, UINT
CHECKF( pDecompPtr ); CHECKF( pDecompPtr );
// Allocate memory for one scanline // Allocate memory for one scanline
pScanLine = MemAlloc( hImage->usWidth ); pScanLine = (UINT8*) MemAlloc( hImage->usWidth );
CHECKF( pScanLine ); CHECKF( pScanLine );
// go past all the scanlines we don't need to process // go past all the scanlines we don't need to process
Standard Gaming Platform/stringicmp.cpp
+15
View File
@@ -12,6 +12,7 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
// An MSVC compliance issue... // An MSVC compliance issue...
//using std::toupper; //using std::toupper;
#if 0
std::string::const_iterator p1 = s1.begin(); std::string::const_iterator p1 = s1.begin();
std::string::const_iterator p2 = s2.begin(); std::string::const_iterator p2 = s2.begin();
@@ -24,4 +25,18 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
if (p2 == s2.end()) return false; if (p2 == s2.end()) return false;
return toupper(*p1) < toupper(*p2); return toupper(*p1) < toupper(*p2);
#else
const char *p1 = s1.c_str();
const char *p2 = s2.c_str();
while (*p1 && *p2 && toupper(*p1) == toupper(*p2)) {
++p1;
++p2;
}
if (!*p1) return *p2;
if (!*p2) return false;
return toupper(*p1) < toupper(*p2);
#endif
} }
Strategic/Strategic_2005Express.vcproj
+506
View File
@@ -0,0 +1,506 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="Strategic_2005Express"
ProjectGUID="{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}"
RootNamespace="Strategic_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Assignments.h"
>
</File>
<File
RelativePath=".\Auto Resolve.h"
>
</File>
<File
RelativePath=".\Campaign Init.h"
>
</File>
<File
RelativePath=".\Campaign Types.h"
>
</File>
<File
RelativePath=".\Creature Spreading.h"
>
</File>
<File
RelativePath=".\Game Clock.h"
>
</File>
<File
RelativePath=".\Game Event Hook.h"
>
</File>
<File
RelativePath=".\Game Events.h"
>
</File>
<File
RelativePath=".\Game Init.h"
>
</File>
<File
RelativePath=".\Map Screen Helicopter.h"
>
</File>
<File
RelativePath=".\Map Screen Interface Border.h"
>
</File>
<File
RelativePath=".\Map Screen Interface Bottom.h"
>
</File>
<File
RelativePath=".\Map Screen Interface Map Inventory.h"
>
</File>
<File
RelativePath=".\Map Screen Interface Map.h"
>
</File>
<File
RelativePath=".\Map Screen Interface TownMine Info.h"
>
</File>
<File
RelativePath=".\Map Screen Interface.h"
>
</File>
<File
RelativePath=".\mapscreen.h"
>
</File>
<File
RelativePath=".\Meanwhile.h"
>
</File>
<File
RelativePath=".\Merc Contract.h"
>
</File>
<File
RelativePath=".\MilitiaSquads.h"
>
</File>
<File
RelativePath=".\Player Command.h"
>
</File>
<File
RelativePath=".\PreBattle Interface.h"
>
</File>
<File
RelativePath=".\Queen Command.h"
>
</File>
<File
RelativePath=".\Quest Debug System.h"
>
</File>
<File
RelativePath=".\Quests.h"
>
</File>
<File
RelativePath=".\QuestText.h"
>
</File>
<File
RelativePath=".\Reinforcement.h"
>
</File>
<File
RelativePath=".\Scheduling.h"
>
</File>
<File
RelativePath=".\Strategic AI.h"
>
</File>
<File
RelativePath=".\Strategic All.h"
>
</File>
<File
RelativePath=".\Strategic Event Handler.h"
>
</File>
<File
RelativePath=".\Strategic Merc Handler.h"
>
</File>
<File
RelativePath=".\Strategic Mines.h"
>
</File>
<File
RelativePath=".\Strategic Movement.h"
>
</File>
<File
RelativePath=".\Strategic Pathing.h"
>
</File>
<File
RelativePath=".\Strategic Status.h"
>
</File>
<File
RelativePath=".\Strategic Town Loyalty.h"
>
</File>
<File
RelativePath=".\strategic town reputation.h"
>
</File>
<File
RelativePath=".\Strategic Turns.h"
>
</File>
<File
RelativePath=".\strategic.h"
>
</File>
<File
RelativePath=".\strategicmap.h"
>
</File>
<File
RelativePath=".\Town Militia.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AI Viewer.cpp"
>
</File>
<File
RelativePath=".\Assignments.cpp"
>
</File>
<File
RelativePath=".\Auto Resolve.cpp"
>
</File>
<File
RelativePath=".\Campaign Init.cpp"
>
</File>
<File
RelativePath=".\Creature Spreading.cpp"
>
</File>
<File
RelativePath=".\Game Clock.cpp"
>
</File>
<File
RelativePath=".\Game Event Hook.cpp"
>
</File>
<File
RelativePath=".\Game Events.cpp"
>
</File>
<File
RelativePath=".\Game Init.cpp"
>
</File>
<File
RelativePath=".\Hourly Update.cpp"
>
</File>
<File
RelativePath=".\Map Screen Helicopter.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface Border.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface Bottom.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface Map Inventory.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface Map.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface TownMine Info.cpp"
>
</File>
<File
RelativePath=".\Map Screen Interface.cpp"
>
</File>
<File
RelativePath=".\mapscreen.cpp"
>
</File>
<File
RelativePath=".\Meanwhile.cpp"
>
</File>
<File
RelativePath=".\Merc Contract.cpp"
>
</File>
<File
RelativePath=".\MilitiaSquads.cpp"
>
</File>
<File
RelativePath=".\Player Command.cpp"
>
</File>
<File
RelativePath=".\PreBattle Interface.cpp"
>
</File>
<File
RelativePath=".\Queen Command.cpp"
>
</File>
<File
RelativePath=".\Quest Debug System.cpp"
>
</File>
<File
RelativePath=".\Quests.cpp"
>
</File>
<File
RelativePath=".\QuestText.cpp"
>
</File>
<File
RelativePath=".\Reinforcement.cpp"
>
</File>
<File
RelativePath=".\Scheduling.cpp"
>
</File>
<File
RelativePath=".\Strategic AI.cpp"
>
</File>
<File
RelativePath=".\Strategic Event Handler.cpp"
>
</File>
<File
RelativePath=".\Strategic Merc Handler.cpp"
>
</File>
<File
RelativePath=".\Strategic Mines.cpp"
>
</File>
<File
RelativePath=".\Strategic Movement Costs.cpp"
>
</File>
<File
RelativePath=".\Strategic Movement.cpp"
>
</File>
<File
RelativePath=".\Strategic Pathing.cpp"
>
</File>
<File
RelativePath=".\Strategic Status.cpp"
>
</File>
<File
RelativePath=".\Strategic Town Loyalty.cpp"
>
</File>
<File
RelativePath=".\strategic town reputation.cpp"
>
</File>
<File
RelativePath=".\Strategic Turns.cpp"
>
</File>
<File
RelativePath=".\strategic.cpp"
>
</File>
<File
RelativePath=".\strategicmap.cpp"
>
</File>
<File
RelativePath=".\Town Militia.cpp"
>
</File>
<File
RelativePath=".\XML_Army.cpp"
>
</File>
<File
RelativePath=".\XML_Roaming.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Tactical/Boxing.cpp
+3 -2
View File
@@ -313,9 +313,10 @@ BOOLEAN CheckOnBoxers( void )
// WANNE: Safty check! // WANNE: Safty check!
if (ubID < TOTAL_SOLDIERS) if (ubID < TOTAL_SOLDIERS)
{ {
if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT ) if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT &&
IS_MERC_BODY_TYPE( MercPtrs[ ubID ] ) )
{ {
// no weapon so this guy is a boxer // no weapon and not a civilian so this guy is a boxer
gubBoxerID[ uiLoop ] = ubID; gubBoxerID[ uiLoop ] = ubID;
} }
} }
Tactical/Handle Items.cpp
+1
View File
@@ -5439,6 +5439,7 @@ UINT8 StealItems(SOLDIERTYPE* pSoldier,SOLDIERTYPE* pOpponent, UINT8* ubIndexRet
InitializeStealItemPickupMenu( pSoldier, pOpponent, pItemPool, ubCount); InitializeStealItemPickupMenu( pSoldier, pOpponent, pItemPool, ubCount);
guiPendingOverrideEvent = G_GETTINGITEM; guiPendingOverrideEvent = G_GETTINGITEM;
HandleTacticalUI(); // 0verhaul: Added to keep this event from going out of style before it is acted on
return( ubCount ); return( ubCount );
} }
Tactical/Handle UI.cpp
+2 -2
View File
@@ -475,7 +475,7 @@ void PreventFromTheFreezingBug(SOLDIERTYPE* pSoldier)
{ {
gfUIInterfaceSetBusy = FALSE; gfUIInterfaceSetBusy = FALSE;
UnSetUIBusy( pSoldier->ubID ); UnSetUIBusy( pSoldier->ubID );
gTacticalStatus.ubAttackBusyCount = 0; // gTacticalStatus.ubAttackBusyCount = 0; // 0verhaul: I know commenting this may not be a good idea, but then neither is this kludgy routine.
guiPendingOverrideEvent = LU_ENDUILOCK; guiPendingOverrideEvent = LU_ENDUILOCK;
UIHandleLUIEndLock( NULL ); UIHandleLUIEndLock( NULL );
} }
@@ -5817,7 +5817,7 @@ void SetUIBusy( UINT8 ubID )
void UnSetUIBusy( UINT8 ubID ) void UnSetUIBusy( UINT8 ubID )
{ {
if ( (gTacticalStatus.uiFlags & INCOMBAT ) && ( gTacticalStatus.uiFlags & TURNBASED ) && ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) ) if ( gfUserTurnRegionActive && (gTacticalStatus.uiFlags & INCOMBAT ) && ( gTacticalStatus.uiFlags & TURNBASED ) && ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{ {
if ( !gTacticalStatus.fUnLockUIAfterHiddenInterrupt ) if ( !gTacticalStatus.fUnLockUIAfterHiddenInterrupt )
{ {
Tactical/Interface Dialogue.cpp
+1
View File
@@ -77,6 +77,7 @@
#include "BobbyRMailOrder.h" #include "BobbyRMailOrder.h"
#include "end game.h" #include "end game.h"
#include "Map Screen Helicopter.h" #include "Map Screen Helicopter.h"
#include "Cheats.h"
#endif #endif
INT16 sBasementEnterGridNos[ ] = { 13362, 13363, 13364, 13365, 13525, 13524 }; INT16 sBasementEnterGridNos[ ] = { 13362, 13363, 13364, 13365, 13525, 13524 };
Tactical/Interface Items.cpp
+2 -2
View File
@@ -6992,7 +6992,7 @@ void ItemPickupOK( GUI_BUTTON *btn, INT32 reason )
if ((gpOpponent->inv[HANDPOS].usItem == NOTHING ) && (usLastItem!=NOTHING)) if ((gpOpponent->inv[HANDPOS].usItem == NOTHING ) && (usLastItem!=NOTHING))
ReLoadSoldierAnimationDueToHandItemChange( gpOpponent, usLastItem, NOTHING ); ReLoadSoldierAnimationDueToHandItemChange( gpOpponent, usLastItem, NOTHING );
PreventFromTheFreezingBug(gItemPickupMenu.pSoldier); // PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
} }
else else
{ {
@@ -7026,7 +7026,7 @@ void ItemPickupCancel( GUI_BUTTON *btn, INT32 reason )
{ {
DeletePool(gItemPickupMenu.pItemPool); DeletePool(gItemPickupMenu.pItemPool);
PreventFromTheFreezingBug(gItemPickupMenu.pSoldier); // PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
} }
} }
else if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE ) else if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE )
Tactical/Items.cpp
+2
View File
@@ -2617,6 +2617,8 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
INT8 bReloadType; INT8 bReloadType;
UINT16 usNewAmmoItem; UINT16 usNewAmmoItem;
bAPs = 0;
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) ) if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
{ {
bAPs = GetAPsToReloadGunWithAmmo( pGun, pAmmo ); bAPs = GetAPsToReloadGunWithAmmo( pGun, pAmmo );
Tactical/Overhead.cpp
+2 -1
View File
@@ -1506,7 +1506,7 @@ BOOLEAN ExecuteOverhead( )
if ( pSoldier->usPathDataSize != MAX_PATH_LIST_SIZE ) if ( pSoldier->usPathDataSize != MAX_PATH_LIST_SIZE )
{ {
#ifdef JA2BETAVERSION #ifdef JA2BETAVERSION
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest .", pSoldier->name, pSoldier->ubID ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest (%d spaces away).", pSoldier->name, pSoldier->ubID, PythSpacesAway( pSoldier->sFinalDestination, pSoldier->sGridNo) );
#endif #endif
} }
@@ -1534,6 +1534,7 @@ BOOLEAN ExecuteOverhead( )
if ( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT) if ( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT)
{ {
ActionDone( pSoldier); ActionDone( pSoldier);
SoldierGotoStationaryStance( pSoldier );
continue; continue;
} }
else else
Tactical/PATHAI.cpp
+15 -1
View File
@@ -918,6 +918,21 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo
//DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String( "PATHAI %d", curLoc ) ); //DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String( "PATHAI %d", curLoc ) );
// 0verhaul: Cannot change direction over a fence!
if (prevCost == TRAVELCOST_FENCE)
{
iLoopStart = trailTree[pCurrPtr->sPathNdx].stepDir;
if (bLoopState == LOOPING_CLOCKWISE) {
iLoopEnd = gOneCCDirection[ iLoopStart];
} else {
iLoopEnd = gOneCDirection[ iLoopStart];
}
}
else
{
iLoopStart = iLoopEnd = 0;
}
if (fContinuousTurnNeeded) if (fContinuousTurnNeeded)
{ {
if (trailTreeNdx < 2) if (trailTreeNdx < 2)
@@ -942,7 +957,6 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo
//for ( iCnt = iLoopStart; iCnt != iLoopEnd; iCnt = (iCnt + iLoopIncrement) % MAXDIR ) //for ( iCnt = iLoopStart; iCnt != iLoopEnd; iCnt = (iCnt + iLoopIncrement) % MAXDIR )
for ( iCnt = iLoopStart; ; ) for ( iCnt = iLoopStart; ; )
{ {
#ifdef VEHICLE #ifdef VEHICLE
/* /*
if (fTurnSlow) if (fTurnSlow)
Tactical/ShopKeeper Interface.cpp
+3 -3
View File
@@ -2625,8 +2625,8 @@ UINT32 DisplayInvSlot( UINT8 ubSlotNum, UINT16 usItemIndex, UINT16 usPosX, UINT1
usHeight = (UINT32)pTrav->usHeight; usHeight = (UINT32)pTrav->usHeight;
usWidth = (UINT32)pTrav->usWidth; usWidth = (UINT32)pTrav->usWidth;
sCenX = usPosX + 7 + (INT16)( abs( SKI_INV_WIDTH - 3.0 - usWidth ) / 2 ) - pTrav->sOffsetX; sCenX = usPosX + 7 + (INT16)( abs( (long) (SKI_INV_WIDTH - 3 - usWidth) ) / 2 ) - pTrav->sOffsetX;
sCenY = usPosY + (INT16)( abs( SKI_INV_HEIGHT - (double)usHeight ) / 2 ) - pTrav->sOffsetY; sCenY = usPosY + (INT16)( abs( (long) (SKI_INV_HEIGHT - usHeight) ) / 2 ) - pTrav->sOffsetY;
//Restore the background region //Restore the background region
@@ -7878,4 +7878,4 @@ void HatchOutInvSlot( UINT16 usPosX, UINT16 usPosY )
//Hatch it out //Hatch it out
DrawHatchOnInventory( guiRENDERBUFFER, usSlotX, usSlotY, usSlotWidth, usSlotHeight ); DrawHatchOnInventory( guiRENDERBUFFER, usSlotX, usSlotY, usSlotWidth, usSlotHeight );
InvalidateRegion( usSlotX, usSlotY, usSlotX + usSlotWidth, usSlotY + usSlotHeight ); InvalidateRegion( usSlotX, usSlotY, usSlotX + usSlotWidth, usSlotY + usSlotHeight );
} }
Tactical/Soldier Ani.cpp
+5 -4
View File
@@ -1475,13 +1475,14 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
case 485: case 485:
// CODE: Try steal..... // CODE: Try steal.....
// UnSetUIBusy( pSoldier->ubID);
UseHandToHand( pSoldier, pSoldier->sPendingActionData2, TRUE ); UseHandToHand( pSoldier, pSoldier->sPendingActionData2, TRUE );
//jackaians: //jackaians:
//if we are not waiting for the pickup menu to be displayed //if we are not waiting for the pickup menu to be displayed
if (guiPendingOverrideEvent != G_GETTINGITEM) // if (guiPendingOverrideEvent != G_GETTINGITEM)
{ // {
PreventFromTheFreezingBug(pSoldier); // PreventFromTheFreezingBug(pSoldier);
} // }
break; break;
case 486: case 486:
Tactical/Soldier Control.cpp
+2
View File
@@ -11229,6 +11229,7 @@ void PickDropItemAnimation( SOLDIERTYPE *pSoldier )
SoldierHandleDropItem( pSoldier ); SoldierHandleDropItem( pSoldier );
SoldierGotoStationaryStance( pSoldier ); SoldierGotoStationaryStance( pSoldier );
ActionDone( pSoldier);
break; break;
} }
} }
@@ -11535,6 +11536,7 @@ void MercStealFromMerc( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pTarget )
{ {
// SEND PENDING ACTION // SEND PENDING ACTION
pSoldier->ubPendingAction = MERC_STEAL; pSoldier->ubPendingAction = MERC_STEAL;
pSoldier->bTargetLevel = pTarget->bLevel; // 0verhaul: Update the level too!
pSoldier->sPendingActionData2 = pTarget->sGridNo; pSoldier->sPendingActionData2 = pTarget->sGridNo;
pSoldier->bPendingActionData3 = ubDirection; pSoldier->bPendingActionData3 = ubDirection;
pSoldier->ubPendingActionAnimCount = 0; pSoldier->ubPendingActionAnimCount = 0;
Tactical/Tactical_2005Express.vcproj
+854
View File
@@ -0,0 +1,854 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="Tactical_2005Express"
ProjectGUID="{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
RootNamespace="Tactical_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Action Items.h"
>
</File>
<File
RelativePath=".\Air Raid.h"
>
</File>
<File
RelativePath=".\Animation Cache.h"
>
</File>
<File
RelativePath=".\Animation Control.h"
>
</File>
<File
RelativePath=".\Animation Data.h"
>
</File>
<File
RelativePath=".\Arms Dealer Init.h"
>
</File>
<File
RelativePath=".\ArmsDealerInvInit.h"
>
</File>
<File
RelativePath=".\Auto Bandage.h"
>
</File>
<File
RelativePath=".\Boxing.h"
>
</File>
<File
RelativePath=".\Bullets.h"
>
</File>
<File
RelativePath=".\Campaign.h"
>
</File>
<File
RelativePath=".\Civ Quotes.h"
>
</File>
<File
RelativePath=".\Dialogue Control.h"
>
</File>
<File
RelativePath=".\DisplayCover.h"
>
</File>
<File
RelativePath=".\Drugs And Alcohol.h"
>
</File>
<File
RelativePath=".\End Game.h"
>
</File>
<File
RelativePath=".\Enemy Soldier Save.h"
>
</File>
<File
RelativePath=".\EnemyItemDrops.h"
>
</File>
<File
RelativePath=".\faces.h"
>
</File>
<File
RelativePath=".\fov.h"
>
</File>
<File
RelativePath=".\GAP.H"
>
</File>
<File
RelativePath=".\Handle Doors.h"
>
</File>
<File
RelativePath=".\Handle Items.h"
>
</File>
<File
RelativePath=".\Handle UI Plan.h"
>
</File>
<File
RelativePath=".\Handle UI.h"
>
</File>
<File
RelativePath=".\Interface Control.h"
>
</File>
<File
RelativePath=".\Interface Cursors.h"
>
</File>
<File
RelativePath=".\interface Dialogue.h"
>
</File>
<File
RelativePath=".\Interface Items.h"
>
</File>
<File
RelativePath=".\Interface Panels.h"
>
</File>
<File
RelativePath=".\Interface Utils.h"
>
</File>
<File
RelativePath=".\Interface.h"
>
</File>
<File
RelativePath=".\Inventory Choosing.h"
>
</File>
<File
RelativePath=".\Item Types.h"
>
</File>
<File
RelativePath=".\Items.h"
>
</File>
<File
RelativePath=".\Keys.h"
>
</File>
<File
RelativePath=".\LOS.h"
>
</File>
<File
RelativePath=".\Map Information.h"
>
</File>
<File
RelativePath=".\merc entering.h"
>
</File>
<File
RelativePath=".\Merc Hiring.h"
>
</File>
<File
RelativePath=".\Militia Control.h"
>
</File>
<File
RelativePath=".\Morale.h"
>
</File>
<File
RelativePath=".\opplist.h"
>
</File>
<File
RelativePath=".\Overhead Types.h"
>
</File>
<File
RelativePath=".\Overhead.h"
>
</File>
<File
RelativePath=".\PATHAI.H"
>
</File>
<File
RelativePath=".\PathAIDebug.h"
>
</File>
<File
RelativePath=".\Points.h"
>
</File>
<File
RelativePath=".\qarray.h"
>
</File>
<File
RelativePath=".\Rain.h"
>
</File>
<File
RelativePath=".\Rotting Corpses.h"
>
</File>
<File
RelativePath=".\rt time defines.h"
>
</File>
<File
RelativePath=".\ShopKeeper Interface.h"
>
</File>
<File
RelativePath=".\ShopKeeper Quotes.h"
>
</File>
<File
RelativePath=".\SkillCheck.h"
>
</File>
<File
RelativePath=".\Soldier Add.h"
>
</File>
<File
RelativePath=".\Soldier Ani.h"
>
</File>
<File
RelativePath=".\Soldier Control.h"
>
</File>
<File
RelativePath=".\Soldier Create.h"
>
</File>
<File
RelativePath=".\Soldier Find.h"
>
</File>
<File
RelativePath=".\Soldier Functions.h"
>
</File>
<File
RelativePath=".\Soldier Init List.h"
>
</File>
<File
RelativePath=".\Soldier macros.h"
>
</File>
<File
RelativePath=".\soldier profile type.h"
>
</File>
<File
RelativePath=".\Soldier Profile.h"
>
</File>
<File
RelativePath=".\soldier tile.h"
>
</File>
<File
RelativePath=".\Spread burst.h"
>
</File>
<File
RelativePath=".\Squads.h"
>
</File>
<File
RelativePath=".\Strategic Exit GUI.h"
>
</File>
<File
RelativePath=".\Structure Wrap.h"
>
</File>
<File
RelativePath=".\Tactical All.h"
>
</File>
<File
RelativePath=".\Tactical Save.h"
>
</File>
<File
RelativePath=".\Tactical Turns.h"
>
</File>
<File
RelativePath=".\TeamTurns.h"
>
</File>
<File
RelativePath=".\UI Cursors.h"
>
</File>
<File
RelativePath=".\Vehicles.h"
>
</File>
<File
RelativePath=".\Weapons.h"
>
</File>
<File
RelativePath=".\World Items.h"
>
</File>
<File
RelativePath=".\XML.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Air Raid.cpp"
>
</File>
<File
RelativePath=".\Animation Cache.cpp"
>
</File>
<File
RelativePath=".\Animation Control.cpp"
>
</File>
<File
RelativePath=".\Animation Data.cpp"
>
</File>
<File
RelativePath=".\Arms Dealer Init.cpp"
>
</File>
<File
RelativePath=".\ArmsDealerInvInit.cpp"
>
</File>
<File
RelativePath=".\Auto Bandage.cpp"
>
</File>
<File
RelativePath=".\Boxing.cpp"
>
</File>
<File
RelativePath=".\bullets.cpp"
>
</File>
<File
RelativePath=".\Campaign.cpp"
>
</File>
<File
RelativePath=".\Civ Quotes.cpp"
>
</File>
<File
RelativePath=".\Dialogue Control.cpp"
>
</File>
<File
RelativePath=".\DisplayCover.cpp"
>
</File>
<File
RelativePath=".\Drugs And Alcohol.cpp"
>
</File>
<File
RelativePath=".\End Game.cpp"
>
</File>
<File
RelativePath=".\Enemy Soldier Save.cpp"
>
</File>
<File
RelativePath=".\EnemyItemDrops.cpp"
>
</File>
<File
RelativePath=".\Faces.cpp"
>
</File>
<File
RelativePath=".\fov.cpp"
>
</File>
<File
RelativePath=".\GAP.cpp"
>
</File>
<File
RelativePath=".\Handle Doors.cpp"
>
</File>
<File
RelativePath=".\Handle Items.cpp"
>
</File>
<File
RelativePath=".\Handle UI Plan.cpp"
>
</File>
<File
RelativePath=".\Handle UI.cpp"
>
</File>
<File
RelativePath=".\Interface Control.cpp"
>
</File>
<File
RelativePath=".\Interface Cursors.cpp"
>
</File>
<File
RelativePath=".\Interface Dialogue.cpp"
>
</File>
<File
RelativePath=".\Interface Items.cpp"
>
</File>
<File
RelativePath=".\Interface Panels.cpp"
>
</File>
<File
RelativePath=".\Interface Utils.cpp"
>
</File>
<File
RelativePath=".\Interface.cpp"
>
</File>
<File
RelativePath=".\Inventory Choosing.cpp"
>
</File>
<File
RelativePath=".\Items.cpp"
>
</File>
<File
RelativePath=".\Keys.cpp"
>
</File>
<File
RelativePath=".\LOS.cpp"
>
</File>
<File
RelativePath=".\Map Information.cpp"
>
</File>
<File
RelativePath=".\Merc Entering.cpp"
>
</File>
<File
RelativePath=".\Merc Hiring.cpp"
>
</File>
<File
RelativePath=".\Militia Control.cpp"
>
</File>
<File
RelativePath=".\Morale.cpp"
>
</File>
<File
RelativePath=".\opplist.cpp"
>
</File>
<File
RelativePath=".\Overhead.cpp"
>
</File>
<File
RelativePath=".\PATHAI.cpp"
>
</File>
<File
RelativePath=".\Points.cpp"
>
</File>
<File
RelativePath=".\QARRAY.cpp"
>
</File>
<File
RelativePath=".\Rain.cpp"
>
</File>
<File
RelativePath=".\Real Time Input.cpp"
>
</File>
<File
RelativePath=".\Rotting Corpses.cpp"
>
</File>
<File
RelativePath=".\ShopKeeper Interface.cpp"
>
</File>
<File
RelativePath=".\SkillCheck.cpp"
>
</File>
<File
RelativePath=".\Soldier Add.cpp"
>
</File>
<File
RelativePath=".\Soldier Ani.cpp"
>
</File>
<File
RelativePath=".\Soldier Control.cpp"
>
</File>
<File
RelativePath=".\Soldier Create.cpp"
>
</File>
<File
RelativePath=".\Soldier Find.cpp"
>
</File>
<File
RelativePath=".\Soldier Init List.cpp"
>
</File>
<File
RelativePath=".\Soldier Profile.cpp"
>
</File>
<File
RelativePath=".\Soldier Tile.cpp"
>
</File>
<File
RelativePath=".\SoldierTooltips.cpp"
>
</File>
<File
RelativePath=".\Spread Burst.cpp"
>
</File>
<File
RelativePath=".\Squads.cpp"
>
</File>
<File
RelativePath=".\Strategic Exit GUI.cpp"
>
</File>
<File
RelativePath=".\Structure Wrap.cpp"
>
</File>
<File
RelativePath=".\Tactical Save.cpp"
>
</File>
<File
RelativePath=".\Tactical Turns.cpp"
>
</File>
<File
RelativePath=".\TeamTurns.cpp"
>
</File>
<File
RelativePath=".\Turn Based Input.cpp"
>
</File>
<File
RelativePath=".\UI Cursors.cpp"
>
</File>
<File
RelativePath=".\Vehicles.cpp"
>
</File>
<File
RelativePath=".\Weapons.cpp"
>
</File>
<File
RelativePath=".\World Items.cpp"
>
</File>
<File
RelativePath=".\XML_AmmoStrings.cpp"
>
</File>
<File
RelativePath=".\XML_AmmoTypes.cpp"
>
</File>
<File
RelativePath=".\XML_Armour.cpp"
>
</File>
<File
RelativePath=".\XML_AttachmentInfo.cpp"
>
</File>
<File
RelativePath=".\XML_Attachments.cpp"
>
</File>
<File
RelativePath=".\XML_BurstSounds.cpp"
>
</File>
<File
RelativePath=".\XML_ComboMergeInfo.cpp"
>
</File>
<File
RelativePath=".\XML_CompatibleFaceItems.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyAmmoDrops.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyArmourDrops.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyExplosiveDrops.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyItemChoice.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyMiscDrops.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyWeaponChoice.cpp"
>
</File>
<File
RelativePath=".\XML_EnemyWeaponDrops.cpp"
>
</File>
<File
RelativePath=".\XML_Explosive.cpp"
>
</File>
<File
RelativePath=".\XML_IMPItemChoices.cpp"
>
</File>
<File
RelativePath=".\XML_IncompatibleAttachments.cpp"
>
</File>
<File
RelativePath=".\XML_Launchable.cpp"
>
</File>
<File
RelativePath=".\XML_Magazine.cpp"
>
</File>
<File
RelativePath=".\XML_Merge.cpp"
>
</File>
<File
RelativePath=".\XML_SectorLoadscreens.cpp"
>
</File>
<File
RelativePath=".\XML_Sounds.cpp"
>
</File>
<File
RelativePath=".\XML_TonyInventory.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
TacticalAI/AIMain.cpp
+4
View File
@@ -2040,6 +2040,10 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
DebugAI( String( "%d does %s (a.d. %d) at time %ld", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, GetJA2Clock() ) ); DebugAI( String( "%d does %s (a.d. %d) at time %ld", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, GetJA2Clock() ) );
// 0verhaul: The decideaction stage does so many path plots and overrides that
// relying on a stored path from there is a bad idea.
pSoldier->usPathDataSize = pSoldier->usPathIndex = pSoldier->bPathStored = 0;
switch (pSoldier->bAction) switch (pSoldier->bAction)
{ {
case AI_ACTION_NONE: // maintain current position & facing case AI_ACTION_NONE: // maintain current position & facing
TacticalAI/DecideAction.cpp
+8
View File
@@ -2805,6 +2805,10 @@ INT8 DecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK)
action = AI_ACTION_FLANK_RIGHT ; action = AI_ACTION_FLANK_RIGHT ;
break; break;
} }
if (action == AI_ACTION_SEEK_OPPONENT) {
return action;
}
} }
else else
return AI_ACTION_SEEK_OPPONENT ; return AI_ACTION_SEEK_OPPONENT ;
@@ -4602,9 +4606,13 @@ INT8 DecideActionBlack(SOLDIERTYPE *pSoldier)
if ( sClosestOpponent != NOWHERE ) if ( sClosestOpponent != NOWHERE )
{ {
// temporarily make boxer have orders of CLOSEPATROL rather than STATIONARY // temporarily make boxer have orders of CLOSEPATROL rather than STATIONARY
// And make him patrol the ring, not his usual place
// so he has a good roaming range // so he has a good roaming range
USHORT tgrd = pSoldier->usPatrolGrid[0];
pSoldier->usPatrolGrid[0] = pSoldier->sGridNo;
pSoldier->bOrders = CLOSEPATROL; pSoldier->bOrders = CLOSEPATROL;
pSoldier->usActionData = GoAsFarAsPossibleTowards( pSoldier, sClosestOpponent, AI_ACTION_GET_CLOSER ); pSoldier->usActionData = GoAsFarAsPossibleTowards( pSoldier, sClosestOpponent, AI_ACTION_GET_CLOSER );
pSoldier->usPatrolGrid[0] = tgrd;
pSoldier->bOrders = STATIONARY; pSoldier->bOrders = STATIONARY;
if ( pSoldier->usActionData != NOWHERE ) if ( pSoldier->usActionData != NOWHERE )
{ {
TacticalAI/FindLocations.cpp
+2
View File
@@ -2477,6 +2477,8 @@ INT16 FindFlankingSpot(SOLDIERTYPE *pSoldier, INT16 sPos, INT8 bAction )
case AI_ACTION_WITHDRAW: case AI_ACTION_WITHDRAW:
sDesiredDir = sDir + 4; sDesiredDir = sDir + 4;
break; break;
default:
sDesiredDir = sDir;
} }
if ( sDesiredDir < 0 ) if ( sDesiredDir < 0 )
TacticalAI/Movement.cpp
+7
View File
@@ -451,6 +451,10 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN
INT8 bAPsLeft, fPathFlags; INT8 bAPsLeft, fPathFlags;
UINT8 ubRoomRequired = 0, ubTempRoom; UINT8 ubRoomRequired = 0, ubTempRoom;
// 0verhaul: Make sure to clear the stored path since this always calculates a new one.
// This is needed if the path cannot be found.
pSoldier->bPathStored = FALSE;
if ( bReserveAPs == -1 ) if ( bReserveAPs == -1 )
{ {
// default reserve points // default reserve points
@@ -539,6 +543,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN
if ( CREATURE_OR_BLOODCAT( pSoldier ) ) if ( CREATURE_OR_BLOODCAT( pSoldier ) )
{ {
// we tried to get close, failed; abort! // we tried to get close, failed; abort!
pSoldier->usPathIndex = pSoldier->usPathDataSize = 0;
return( NOWHERE ); return( NOWHERE );
} }
else else
@@ -593,6 +598,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN
AINumMessage("Couldn't find OK destination around grid #",sDesGrid); AINumMessage("Couldn't find OK destination around grid #",sDesGrid);
#endif #endif
pSoldier->usPathIndex = pSoldier->usPathDataSize = 0;
return(NOWHERE); return(NOWHERE);
} }
@@ -739,6 +745,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN
AIPopMessage(tempstr); AIPopMessage(tempstr);
#endif #endif
pSoldier->usPathIndex = pSoldier->usPathDataSize = 0;
return(NOWHERE); // then go nowhere return(NOWHERE); // then go nowhere
} }
else else
TacticalAI/TacticalAI_2005Express.vcproj
+238
View File
@@ -0,0 +1,238 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="TacticalAI_2005Express"
ProjectGUID="{27A49DAF-3F5A-4FF2-B943-9559F0B63032}"
RootNamespace="TacticalAI_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\AI All.h"
>
</File>
<File
RelativePath=".\ai.h"
>
</File>
<File
RelativePath=".\AIInternals.h"
>
</File>
<File
RelativePath=".\AIList.h"
>
</File>
<File
RelativePath=".\NPC.h"
>
</File>
<File
RelativePath=".\QuestDebug.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AIList.cpp"
>
</File>
<File
RelativePath=".\AIMain.cpp"
>
</File>
<File
RelativePath=".\AIUtils.cpp"
>
</File>
<File
RelativePath=".\Attacks.cpp"
>
</File>
<File
RelativePath=".\CreatureDecideAction.cpp"
>
</File>
<File
RelativePath=".\DecideAction.cpp"
>
</File>
<File
RelativePath=".\FindLocations.cpp"
>
</File>
<File
RelativePath=".\Knowledge.cpp"
>
</File>
<File
RelativePath=".\Medical.cpp"
>
</File>
<File
RelativePath=".\Movement.cpp"
>
</File>
<File
RelativePath=".\NPC.cpp"
>
</File>
<File
RelativePath=".\PanicButtons.cpp"
>
</File>
<File
RelativePath=".\QuestDebug.cpp"
>
</File>
<File
RelativePath=".\Realtime.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
TileEngine/Explosion Control.cpp
+1
View File
@@ -2051,6 +2051,7 @@ void GetRayStopInfo( UINT32 uiNewSpot, UINT8 ubDir, INT8 bLevel, BOOLEAN fSmokeE
} }
// ATE: For smoke, don't let it go over roof.... // ATE: For smoke, don't let it go over roof....
// 0verhaul: Why not?
if ( fSmokeEffect ) if ( fSmokeEffect )
{ {
if ( bLevel ) if ( bLevel )
TileEngine/SmokeEffects.cpp
+3 -2
View File
@@ -185,7 +185,8 @@ INT32 NewSmokeEffect( INT16 sGridNo, UINT16 usItem, INT8 bLevel, UINT8 ubOwner )
pSmoke->uiTimeOfLastUpdate = GetWorldTotalSeconds( ); pSmoke->uiTimeOfLastUpdate = GetWorldTotalSeconds( );
// Are we indoors? // Are we indoors?
if ( GetTerrainType( sGridNo ) == FLAT_FLOOR ) // 0verhaul: Are we on the floor level?
if ( GetTerrainType( sGridNo ) == FLAT_FLOOR && bLevel)
{ {
pSmoke->bFlags |= SMOKE_EFFECT_INDOORS; pSmoke->bFlags |= SMOKE_EFFECT_INDOORS;
} }
@@ -579,7 +580,7 @@ void DecaySmokeEffects( UINT32 uiTime )
else else
{ {
// damage anyone standing in cloud // damage anyone standing in cloud
SpreadEffect( pSmoke->sGridNo, pSmoke->ubRadius, pSmoke->usItem, pSmoke->ubOwner, REDO_SPREAD_EFFECT, 0, cnt ); SpreadEffect( pSmoke->sGridNo, pSmoke->ubRadius, pSmoke->usItem, pSmoke->ubOwner, REDO_SPREAD_EFFECT, bLevel, cnt );
} }
} }
} }
TileEngine/TileEngine_2005Express.vcproj
+458
View File
@@ -0,0 +1,458 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="TileEngine_2005Express"
ProjectGUID="{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
RootNamespace="TileEngine_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Ambient Control.h"
>
</File>
<File
RelativePath=".\Ambient Types.h"
>
</File>
<File
RelativePath=".\Buildings.h"
>
</File>
<File
RelativePath=".\environment.h"
>
</File>
<File
RelativePath=".\Exit Grids.h"
>
</File>
<File
RelativePath=".\Explosion Control.h"
>
</File>
<File
RelativePath=".\Fog Of War.h"
>
</File>
<File
RelativePath=".\Interactive Tiles.h"
>
</File>
<File
RelativePath=".\Isometric Utils.h"
>
</File>
<File
RelativePath=".\LightEffects.h"
>
</File>
<File
RelativePath=".\lighting.h"
>
</File>
<File
RelativePath=".\Map Edgepoints.h"
>
</File>
<File
RelativePath=".\overhead map.h"
>
</File>
<File
RelativePath=".\phys math.h"
>
</File>
<File
RelativePath=".\physics.h"
>
</File>
<File
RelativePath=".\pits.h"
>
</File>
<File
RelativePath=".\Radar Screen.h"
>
</File>
<File
RelativePath=".\Render Dirty.h"
>
</File>
<File
RelativePath=".\Render Fun.h"
>
</File>
<File
RelativePath=".\renderworld.h"
>
</File>
<File
RelativePath=".\SaveLoadMap.h"
>
</File>
<File
RelativePath=".\Shade Table Util.h"
>
</File>
<File
RelativePath=".\Simple Render Utils.h"
>
</File>
<File
RelativePath=".\Smell.h"
>
</File>
<File
RelativePath=".\SmokeEffects.h"
>
</File>
<File
RelativePath=".\Structure Internals.h"
>
</File>
<File
RelativePath=".\structure.h"
>
</File>
<File
RelativePath=".\sysutil.h"
>
</File>
<File
RelativePath=".\Tactical Placement GUI.h"
>
</File>
<File
RelativePath=".\Tile Animation.h"
>
</File>
<File
RelativePath=".\Tile Cache.h"
>
</File>
<File
RelativePath=".\Tile Surface.h"
>
</File>
<File
RelativePath=".\TileDat.h"
>
</File>
<File
RelativePath=".\tiledef.h"
>
</File>
<File
RelativePath=".\TileEngine All.h"
>
</File>
<File
RelativePath=".\World Tileset Enums.h"
>
</File>
<File
RelativePath=".\WorldDat.h"
>
</File>
<File
RelativePath=".\worlddef.h"
>
</File>
<File
RelativePath=".\worldman.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Ambient Control.cpp"
>
</File>
<File
RelativePath=".\Buildings.cpp"
>
</File>
<File
RelativePath=".\environment.cpp"
>
</File>
<File
RelativePath=".\Exit Grids.cpp"
>
</File>
<File
RelativePath=".\Explosion Control.cpp"
>
</File>
<File
RelativePath=".\Fog Of War.cpp"
>
</File>
<File
RelativePath=".\Interactive Tiles.cpp"
>
</File>
<File
RelativePath=".\Isometric Utils.cpp"
>
</File>
<File
RelativePath=".\LightEffects.cpp"
>
</File>
<File
RelativePath=".\lighting.cpp"
>
</File>
<File
RelativePath=".\Map Edgepoints.cpp"
>
</File>
<File
RelativePath=".\overhead map.cpp"
>
</File>
<File
RelativePath=".\phys math.cpp"
>
</File>
<File
RelativePath=".\physics.cpp"
>
</File>
<File
RelativePath=".\pits.cpp"
>
</File>
<File
RelativePath=".\Radar Screen.cpp"
>
</File>
<File
RelativePath=".\Render Dirty.cpp"
>
</File>
<File
RelativePath=".\Render Fun.cpp"
>
</File>
<File
RelativePath=".\renderworld.cpp"
>
</File>
<File
RelativePath=".\SaveLoadMap.cpp"
>
</File>
<File
RelativePath=".\Shade Table Util.cpp"
>
</File>
<File
RelativePath=".\Simple Render Utils.cpp"
>
</File>
<File
RelativePath=".\Smell.cpp"
>
</File>
<File
RelativePath=".\SmokeEffects.cpp"
>
</File>
<File
RelativePath=".\structure.cpp"
>
</File>
<File
RelativePath=".\sysutil.cpp"
>
</File>
<File
RelativePath=".\Tactical Placement GUI.cpp"
>
</File>
<File
RelativePath=".\Tile Animation.cpp"
>
</File>
<File
RelativePath=".\Tile Cache.cpp"
>
</File>
<File
RelativePath=".\Tile Surface.cpp"
>
</File>
<File
RelativePath=".\TileDat.cpp"
>
</File>
<File
RelativePath=".\tiledef.cpp"
>
</File>
<File
RelativePath=".\WorldDat.cpp"
>
</File>
<File
RelativePath=".\worlddef.cpp"
>
</File>
<File
RelativePath=".\worldman.cpp"
>
</File>
<File
RelativePath=".\XML_ExplosionData.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
TileEngine/worlddef.cpp
+1 -1
View File
@@ -2480,7 +2480,7 @@ BOOLEAN EvaluateWorld( STR8 pSector, UINT8 ubLevel )
{ //skip static priority placement { //skip static priority placement
// WDS - Clean up inventory handling // WDS - Clean up inventory handling
LOADDATA( &priority, pBuffer, SIZEOF_SOLDIERCREATE_STRUCT_POD); //SIZEOF_SOLDIERCREATE_STRUCT ); LOADDATA( &priority, pBuffer, SIZEOF_SOLDIERCREATE_STRUCT_POD); //SIZEOF_SOLDIERCREATE_STRUCT );
priority.CopyOldDataToNew(); priority.CopyOldInventoryToNew();
if( priority.ubProfile != NO_PROFILE ) if( priority.ubProfile != NO_PROFILE )
pTeam->ubProfile++; pTeam->ubProfile++;
else else
Utils/Animated ProgressBar.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ void SetProgressBarTitle( UINT32 ubID, STR16 pString, UINT32 usFont, UINT8 ubFor
} }
if( pString && wcslen( pString ) ) if( pString && wcslen( pString ) )
{ {
pCurr->swzTitle = (STR16) MemAlloc( sizeof( CHAR16 ) * ( wcslen( pString ) + 1 ) ); pCurr->swzTitle = (STR16) MemAlloc( (UINT32) ( sizeof( CHAR16 ) * ( wcslen( pString ) + 1 ) ) );
swprintf( pCurr->swzTitle, pString ); swprintf( pCurr->swzTitle, pString );
} }
pCurr->usTitleFont = (UINT16)usFont; pCurr->usTitleFont = (UINT16)usFont;
Utils/Multi Language Graphic Utils.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
#elif defined( POLISH ) #elif defined( POLISH )
sprintf( zLanguage, "POLISH" ); sprintf( zLanguage, "POLISH" );
#elif defined( RUSSIAN ) #elif defined( RUSSIAN )
sprintf( (char*)zLanguage, "RUSSIAN" ); sprintf( zLanguage, "RUSSIAN" );
#elif defined( SPANISH ) #elif defined( SPANISH )
sprintf( zLanguage, "SPANISH" ); sprintf( zLanguage, "SPANISH" );
#elif defined( TAIWANESE ) #elif defined( TAIWANESE )
Utils/Utils_2005Express.vcproj
+446
View File
@@ -0,0 +1,446 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="Utils_2005Express"
ProjectGUID="{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}"
RootNamespace="Utils_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\_Ja25EnglishText.h"
>
</File>
<File
RelativePath=".\_Ja25GermanText.h"
>
</File>
<File
RelativePath=".\_Ja25RussianText.h"
>
</File>
<File
RelativePath=".\Animated ProgressBar.h"
>
</File>
<File
RelativePath=".\Cinematics.h"
>
</File>
<File
RelativePath=".\Cursors.h"
>
</File>
<File
RelativePath=".\Debug Control.h"
>
</File>
<File
RelativePath=".\dsutil.h"
>
</File>
<File
RelativePath=".\Encrypted File.h"
>
</File>
<File
RelativePath=".\Event Manager.h"
>
</File>
<File
RelativePath=".\Event Pump.h"
>
</File>
<File
RelativePath=".\Font Control.h"
>
</File>
<File
RelativePath=".\INIReader.h"
>
</File>
<File
RelativePath=".\maputility.h"
>
</File>
<File
RelativePath=".\MercTextBox.h"
>
</File>
<File
RelativePath=".\message.h"
>
</File>
<File
RelativePath=".\Multi Language Graphic Utils.h"
>
</File>
<File
RelativePath=".\Multilingual Text Code Generator.h"
>
</File>
<File
RelativePath=".\Music Control.h"
>
</File>
<File
RelativePath=".\PopUpBox.h"
>
</File>
<File
RelativePath=".\Quantize Wrap.h"
>
</File>
<File
RelativePath=".\Quantize.h"
>
</File>
<File
RelativePath=".\Slider.h"
>
</File>
<File
RelativePath=".\Sound Control.h"
>
</File>
<File
RelativePath=".\STIConvert.h"
>
</File>
<File
RelativePath=".\Text Input.h"
>
</File>
<File
RelativePath=".\Text.h"
>
</File>
<File
RelativePath=".\Timer Control.h"
>
</File>
<File
RelativePath=".\Utilities.h"
>
</File>
<File
RelativePath=".\Utils All.h"
>
</File>
<File
RelativePath=".\Win Util.h"
>
</File>
<File
RelativePath=".\WordWrap.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\_DutchText.cpp"
>
</File>
<File
RelativePath=".\_EnglishText.cpp"
>
</File>
<File
RelativePath=".\_FrenchText.cpp"
>
</File>
<File
RelativePath=".\_GermanText.cpp"
>
</File>
<File
RelativePath=".\_ItalianText.cpp"
>
</File>
<File
RelativePath=".\_Ja25EnglishText.cpp"
>
</File>
<File
RelativePath=".\_Ja25GermanText.cpp"
>
</File>
<File
RelativePath=".\_Ja25RussianText.cpp"
>
</File>
<File
RelativePath=".\_PolishText.cpp"
>
</File>
<File
RelativePath=".\_RussianText.cpp"
>
</File>
<File
RelativePath=".\_TaiwaneseText.cpp"
>
</File>
<File
RelativePath=".\Animated ProgressBar.cpp"
>
</File>
<File
RelativePath=".\Cinematics.cpp"
>
</File>
<File
RelativePath=".\Cursors.cpp"
>
</File>
<File
RelativePath=".\Debug Control.cpp"
>
</File>
<File
RelativePath=".\dsutil.cpp"
>
</File>
<File
RelativePath=".\Encrypted File.cpp"
>
</File>
<File
RelativePath=".\Event Manager.cpp"
>
</File>
<File
RelativePath=".\Event Pump.cpp"
>
</File>
<File
RelativePath=".\Font Control.cpp"
>
</File>
<File
RelativePath=".\INIReader.cpp"
>
</File>
<File
RelativePath=".\MapUtility.cpp"
>
</File>
<File
RelativePath=".\MercTextBox.cpp"
>
</File>
<File
RelativePath=".\message.cpp"
>
</File>
<File
RelativePath=".\Multi Language Graphic Utils.cpp"
>
</File>
<File
RelativePath=".\Multilingual Text Code Generator.cpp"
>
</File>
<File
RelativePath=".\Music Control.cpp"
>
</File>
<File
RelativePath=".\PopUpBox.cpp"
>
</File>
<File
RelativePath=".\Quantize Wrap.cpp"
>
</File>
<File
RelativePath=".\Quantize.cpp"
>
</File>
<File
RelativePath=".\Slider.cpp"
>
</File>
<File
RelativePath=".\Sound Control.cpp"
>
</File>
<File
RelativePath=".\STIConvert.cpp"
>
</File>
<File
RelativePath=".\Text Input.cpp"
>
</File>
<File
RelativePath=".\Text Utils.cpp"
>
</File>
<File
RelativePath=".\Timer Control.cpp"
>
</File>
<File
RelativePath=".\Utilities.cpp"
>
</File>
<File
RelativePath=".\WordWrap.cpp"
>
</File>
<File
RelativePath=".\XML_Items.cpp"
>
</File>
<File
RelativePath=".\XML_Strings.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Utils/Win Util.cpp
+2 -1
View File
@@ -45,7 +45,8 @@ LPDIRECTSOUNDBUFFER lpSoundEffects[NUM_SOUND_EFFECTS];
char szSoundEffects[NUM_SOUND_EFFECTS][255] = //char szSoundEffects[NUM_SOUND_EFFECTS][255] =
char szSoundEffects[MAX_SAMPLES][255] =
{ {
"SHOOT1", "SHOOT1",
"MISS1", "MISS1",
Utils/XMLAccess.cpp
+2
View File
@@ -1,3 +1,5 @@
#include "Types.h"
#define WEAPONSFILENAME "TABLEDATA\\Weapons.dat" #define WEAPONSFILENAME "TABLEDATA\\Weapons.dat"
#define MAX_CHAR_DATA_LENGTH 500 #define MAX_CHAR_DATA_LENGTH 500
builddefines.h
+5 -5
View File
@@ -11,11 +11,11 @@
//#define JA2EDITOR //#define JA2EDITOR
// #define DEBUG_ATTACKBUSY //#define DEBUG_ATTACKBUSY
//#define LUACONSOLE //#define LUACONSOLE
//#define ROBOT_ALWAYS_READY #define ROBOT_ALWAYS_READY
//#ifdef _DEBUG //#ifdef _DEBUG
// #ifndef JA2TESTVERSION // #ifndef JA2TESTVERSION
@@ -33,9 +33,9 @@
#ifdef JA2BETAVERSION #ifdef JA2BETAVERSION
#ifndef JA2EDITOR #ifndef JA2EDITOR
#define SGP_DEBUG // #define SGP_DEBUG
#define FORCE_ASSERTS_ON // #define FORCE_ASSERTS_ON
#define SGP_VIDEO_DEBUGGING // #define SGP_VIDEO_DEBUGGING
#endif #endif
#endif #endif
ja2_2005Express.sln
+85
View File
@@ -0,0 +1,85 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja2_2005Express", "ja2_2005Express.vcproj", "{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
ProjectSection(ProjectDependencies) = postProject
{5234CD2E-97F1-42FF-828D-CE0A1B46805E} = {5234CD2E-97F1-42FF-828D-CE0A1B46805E}
{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C} = {262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}
{6283CE93-2960-4596-8E74-7A6FBA8716FF} = {6283CE93-2960-4596-8E74-7A6FBA8716FF}
{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096} = {D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}
{27A49DAF-3F5A-4FF2-B943-9559F0B63032} = {27A49DAF-3F5A-4FF2-B943-9559F0B63032}
{A83DA7DA-2C31-45D8-9A69-B4993A885E76} = {A83DA7DA-2C31-45D8-9A69-B4993A885E76}
{AB8837DB-0435-40C7-916A-0AACF5CFF1C4} = {AB8837DB-0435-40C7-916A-0AACF5CFF1C4}
{FC1938E8-9253-49A8-AA99-4639BBB46C1B} = {FC1938E8-9253-49A8-AA99-4639BBB46C1B}
{60D793F2-90B4-43C9-83B5-221EE11B37E6} = {60D793F2-90B4-43C9-83B5-221EE11B37E6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor_2005Express", "Editor\Editor_2005Express.vcproj", "{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Laptop_2005Express", "Laptop\Laptop_2005Express.vcproj", "{5234CD2E-97F1-42FF-828D-CE0A1B46805E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_2005Express", "lua\lua_2005Express.vcproj", "{A83DA7DA-2C31-45D8-9A69-B4993A885E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGP_2005Express", "Standard Gaming Platform\SGP_2005Express.vcproj", "{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strategic_2005Express", "Strategic\Strategic_2005Express.vcproj", "{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactical_2005Express", "Tactical\Tactical_2005Express.vcproj", "{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TacticalAI_2005Express", "TacticalAI\TacticalAI_2005Express.vcproj", "{27A49DAF-3F5A-4FF2-B943-9559F0B63032}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TileEngine_2005Express", "TileEngine\TileEngine_2005Express.vcproj", "{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils_2005Express", "Utils\Utils_2005Express.vcproj", "{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Debug|Win32.ActiveCfg = Debug|Win32
{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Debug|Win32.Build.0 = Debug|Win32
{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Release|Win32.ActiveCfg = Release|Win32
{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Release|Win32.Build.0 = Release|Win32
{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Debug|Win32.ActiveCfg = Debug|Win32
{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Debug|Win32.Build.0 = Debug|Win32
{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Release|Win32.ActiveCfg = Release|Win32
{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Release|Win32.Build.0 = Release|Win32
{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Debug|Win32.ActiveCfg = Debug|Win32
{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Debug|Win32.Build.0 = Debug|Win32
{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Release|Win32.ActiveCfg = Release|Win32
{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Release|Win32.Build.0 = Release|Win32
{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Debug|Win32.ActiveCfg = Debug|Win32
{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Debug|Win32.Build.0 = Debug|Win32
{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Release|Win32.ActiveCfg = Release|Win32
{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Release|Win32.Build.0 = Release|Win32
{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Debug|Win32.ActiveCfg = Debug|Win32
{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Debug|Win32.Build.0 = Debug|Win32
{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Release|Win32.ActiveCfg = Release|Win32
{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Release|Win32.Build.0 = Release|Win32
{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Debug|Win32.ActiveCfg = Debug|Win32
{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Debug|Win32.Build.0 = Debug|Win32
{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Release|Win32.ActiveCfg = Release|Win32
{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Release|Win32.Build.0 = Release|Win32
{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Debug|Win32.ActiveCfg = Debug|Win32
{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Debug|Win32.Build.0 = Debug|Win32
{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Release|Win32.ActiveCfg = Release|Win32
{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Release|Win32.Build.0 = Release|Win32
{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Debug|Win32.ActiveCfg = Debug|Win32
{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Debug|Win32.Build.0 = Debug|Win32
{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Release|Win32.ActiveCfg = Release|Win32
{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Release|Win32.Build.0 = Release|Win32
{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Debug|Win32.ActiveCfg = Debug|Win32
{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Debug|Win32.Build.0 = Debug|Win32
{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Release|Win32.ActiveCfg = Release|Win32
{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Release|Win32.Build.0 = Release|Win32
{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Debug|Win32.ActiveCfg = Debug|Win32
{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Debug|Win32.Build.0 = Debug|Win32
{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Release|Win32.ActiveCfg = Release|Win32
{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
ja2_2005Express.vcproj
+443
View File
@@ -0,0 +1,443 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="ja2_2005Express"
ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
RootNamespace="ja2_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="C:\Program Files\Jagged Alliance 2 1.13"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops"
UseOfMFC="0"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib"
OutputFile="$(OutDir)\ja2_deb.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="C:\Program Files\Jagged Alliance 2 1.13"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops"
UseOfMFC="0"
CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib"
OutputFile="$(OutDir)\ja2_rel.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\aniviewscreen.cpp"
>
</File>
<File
RelativePath=".\Credits.cpp"
>
</File>
<File
RelativePath=".\Fade Screen.cpp"
>
</File>
<File
RelativePath=".\GameInitOptionsScreen.cpp"
>
</File>
<File
RelativePath=".\gameloop.cpp"
>
</File>
<File
RelativePath=".\gamescreen.cpp"
>
</File>
<File
RelativePath=".\GameSettings.cpp"
>
</File>
<File
RelativePath=".\GameVersion.cpp"
>
</File>
<File
RelativePath=".\HelpScreen.cpp"
>
</File>
<File
RelativePath=".\Init.cpp"
>
</File>
<File
RelativePath=".\Intro.cpp"
>
</File>
<File
RelativePath=".\JA2 Splash.cpp"
>
</File>
<File
RelativePath=".\jascreens.cpp"
>
</File>
<File
RelativePath=".\Loading Screen.cpp"
>
</File>
<File
RelativePath=".\MainMenuScreen.cpp"
>
</File>
<File
RelativePath=".\MessageBoxScreen.cpp"
>
</File>
<File
RelativePath=".\Options Screen.cpp"
>
</File>
<File
RelativePath=".\SaveLoadGame.cpp"
>
</File>
<File
RelativePath=".\SaveLoadScreen.cpp"
>
</File>
<File
RelativePath=".\SCREENS.cpp"
>
</File>
<File
RelativePath=".\Sys Globals.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\builddefines.h"
>
</File>
<File
RelativePath=".\Cheats.h"
>
</File>
<File
RelativePath=".\Credits.h"
>
</File>
<File
RelativePath=".\Fade Screen.h"
>
</File>
<File
RelativePath=".\GameInitOptionsScreen.h"
>
</File>
<File
RelativePath=".\gameloop.h"
>
</File>
<File
RelativePath=".\gamescreen.h"
>
</File>
<File
RelativePath=".\GameSettings.h"
>
</File>
<File
RelativePath=".\GameVersion.h"
>
</File>
<File
RelativePath=".\HelpScreen.h"
>
</File>
<File
RelativePath=".\HelpScreenText.h"
>
</File>
<File
RelativePath=".\Init.h"
>
</File>
<File
RelativePath=".\Intro.h"
>
</File>
<File
RelativePath=".\JA2 All.h"
>
</File>
<File
RelativePath=".\JA2 Demo Ads.h"
>
</File>
<File
RelativePath=".\JA2 Splash.h"
>
</File>
<File
RelativePath=".\ja2.h"
>
</File>
<File
RelativePath=".\jascreens.h"
>
</File>
<File
RelativePath=".\Language Defines.h"
>
</File>
<File
RelativePath=".\Loading Screen.h"
>
</File>
<File
RelativePath=".\local.h"
>
</File>
<File
RelativePath=".\mainmenuscreen.h"
>
</File>
<File
RelativePath=".\MessageBoxScreen.h"
>
</File>
<File
RelativePath=".\Options Screen.h"
>
</File>
<File
RelativePath=".\Res\resource.h"
>
</File>
<File
RelativePath=".\SaveLoadGame.h"
>
</File>
<File
RelativePath=".\SaveLoadScreen.h"
>
</File>
<File
RelativePath=".\screenids.h"
>
</File>
<File
RelativePath=".\SCREENS.H"
>
</File>
<File
RelativePath=".\Sys Globals.h"
>
</File>
<File
RelativePath=".\VtuneApi.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\Res\ja2.rc"
>
</File>
<File
RelativePath=".\Res\jagged3.ico"
>
</File>
</Filter>
<File
RelativePath=".\fmodvc.lib"
>
</File>
<File
RelativePath=".\libexpatMT.lib"
>
</File>
<File
RelativePath=".\lua51.lib"
>
</File>
<File
RelativePath=".\mss32.lib"
>
</File>
<File
RelativePath=".\SMACKW32.LIB"
>
</File>
<File
RelativePath=".\VtuneApi.lib"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
ja2_2005Express.vsprops
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="ja2_2005Express"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Utils;..\TileEngine;..\TacticalAI;..\Tactical;..\Strategic;&quot;..\Standard Gaming Platform&quot;;..\Res;..\lua;..\Laptop;..\Editor;..\;$(NOINHERIT)"
PreprocessorDefinitions="JA2;CINTERFACE;XML_STATIC"
Detect64BitPortabilityProblems="false"
/>
</VisualStudioPropertySheet>
libexpatMT.lib
BIN
View File
Binary file not shown.
lua/lua_2005Express.vcproj
+202
View File
@@ -0,0 +1,202 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="lua_2005Express"
ProjectGUID="{A83DA7DA-2C31-45D8-9A69-B4993A885E76}"
RootNamespace="lua_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Console.h"
>
</File>
<File
RelativePath=".\lauxlib.h"
>
</File>
<File
RelativePath=".\Lua Interpreter.h"
>
</File>
<File
RelativePath=".\lua.h"
>
</File>
<File
RelativePath=".\lua.hpp"
>
</File>
<File
RelativePath=".\luaconf.h"
>
</File>
<File
RelativePath=".\lualib.h"
>
</File>
<File
RelativePath=".\lwstring.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Console.cpp"
>
</File>
<File
RelativePath=".\lua.cpp"
>
</File>
<File
RelativePath=".\lwstring.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
lua51_vs2003.lib
BIN
View File
Binary file not shown.
lua51_vs2005.lib
BIN
View File
Binary file not shown.
resource.h
-16
View File
@@ -1,16 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by ja2.rc
//
#define IDI_ICON1 113
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 114
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif