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

- Fixed compilation errors in VS 2005

Browse Source 
- Updated Revision number: 2996

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-10 10:13:02 +00:00
parent 1c69e1a019
commit 76b990f133
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+4 -4
View File
@@ -13,12 +13,12 @@
#ifdef JA2EDITOR
//MAP EDITOR BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2993" };
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2996" };
#elif defined JA2BETAVERSION
//BETA/TEST BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2993" };
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2996" };
#elif defined CRIPPLED_VERSION
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Release v1.13.2963" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.2996" };
#endif
CHAR8 czVersionNumber[16] = { "Build 09.06.09" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 09.06.10" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
Strategic/Campaign Init.cpp
+20 -1
View File
@@ -20,6 +20,8 @@
#endif
#include "connect.h"
#include "VFS/vfs.h"
#include "XMLWriter.h"
extern BOOLEAN InitStrategicMovementCosts();
void InitKnowFacilitiesFlags( );
@@ -205,6 +207,7 @@ BOOLEAN ReadInAltSectors(STR fileName)
BOOLEAN WriteInAltSectors(STR fileName)
{
#ifndef USE_VFS
// Lets output the current Strategic map format using the XML structure I've devised.
FILE *outfile = fopen(fileName, "wt");
@@ -223,7 +226,23 @@ BOOLEAN WriteInAltSectors(STR fileName)
fprintf (outfile, "</ALT_SECTORS_LIST>\n");
fclose(outfile);
#else
XMLWriter xmlw;
xmlw.OpenNode(L"ALT_SECTORS_LIST");
UINT32 x, y;
for(y = 1;y <= 16;y++)
{
xmlw.AddAttributeToNextValue(L"y",(char)(y+0x40));
std::stringstream ss;
for(x = 1;x <= 16; x++)
{
ss << " " << RandomSector[ ((y - 1) * 16) + (x - 1) ];
}
xmlw.AddValue(L"ROW", ss.str());
}
xmlw.CloseNode();
xmlw.WriteToFile(fileName);
#endif
return (TRUE);
}
Strategic/strategicmap.cpp
+2 -2
View File
@@ -109,8 +109,8 @@
#include "connect.h" //hayden added alot ""'s to get around client spawing random/different placed AI
#include "SaveLoadGame.h"
#include "vfs.h"
#include "PropertyContainer.h"
#include "VFS/vfs.h"
#include "VFS/Tools/Log.h"
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
ja2_2005Express.vcproj
+4 -4
View File
@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_Debug_2963.exe"
OutputFile="$(OutDir)\JA2_EN_Debug_2996.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -145,7 +145,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_2963.exe"
OutputFile="$(OutDir)\JA2_EN_2996.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -229,7 +229,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\MapEditor_EN_Release_2993.exe"
OutputFile="$(OutDir)\MapEditor_EN_2996.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -316,7 +316,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\MapEditor_EN_Debug_2993.exe"
OutputFile="$(OutDir)\MapEditor_EN_Debug_2996.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
ja2_VS2008.vcproj
+5 -5
View File
@@ -18,7 +18,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="C:\games\jagged alliance 2 EN"
OutputDirectory="\games\jagged alliance 2"
IntermediateDirectory="build\VS2008\$(ProjectName)_$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Debug.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops"
@@ -62,7 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_MP_EN_Debug_VS2008.exe"
OutputFile="$(OutDir)\JA2_EN_Debug_2996.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="Multiplayer\raknet"
IgnoreDefaultLibraryNames="libc"
@@ -141,7 +141,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_MP_EN_v1.1.exe"
OutputFile="$(OutDir)\JA2_EN_2996.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="Multiplayer\raknet"
GenerateDebugInformation="false"
@@ -221,7 +221,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\Map Editor_2389_en.exe"
OutputFile="$(OutDir)\MapEditor_EN_2996.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="Multiplayer\raknet"
GenerateDebugInformation="false"
@@ -299,7 +299,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\Map EditorD_2389_en.exe"
OutputFile="$(OutDir)\MapEditor_EN_Debug_2996.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="Multiplayer\raknet"
IgnoreDefaultLibraryNames=""