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

- fixed map editor incompatibility with the merged multiplayer code

Browse Source 
- fixed crashes when loading modified maps in tactical
- added missing "is_networked" condition to the method AddPossiblePendingEnemiesToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-05-17 21:51:32 +00:00
parent d576fc6b99
commit f17cc948a4
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+5 -1
View File
@@ -881,7 +881,11 @@ void recieveAI (RPCParameters *rpcParameters)
new_standard_data.bMedical = send_inv->standard_data.bMedical; new_standard_data.bMedical = send_inv->standard_data.bMedical;
new_standard_data.bMorale = send_inv->standard_data.bMorale; new_standard_data.bMorale = send_inv->standard_data.bMorale;
new_standard_data.bOrders = send_inv->standard_data.bOrders; new_standard_data.bOrders = send_inv->standard_data.bOrders;
memcpy( new_standard_data.PADDINGSLOTS, send_inv->standard_data.PADDINGSLOTS, sizeof( INT8 ) * 14 );
// WANNE - MP: I had to remove this line of code, because PADDINGSLOTS in the structure
// breaks the editor and leads to crashed of modifed maps!
//memcpy( new_standard_data.PADDINGSLOTS, send_inv->standard_data.PADDINGSLOTS, sizeof( INT8 ) * 14 );
new_standard_data.bPatrolCnt = send_inv->standard_data.bPatrolCnt; new_standard_data.bPatrolCnt = send_inv->standard_data.bPatrolCnt;
new_standard_data.bSectorZ = send_inv->standard_data.bSectorZ; new_standard_data.bSectorZ = send_inv->standard_data.bSectorZ;
new_standard_data.bStrength = send_inv->standard_data.bStrength; new_standard_data.bStrength = send_inv->standard_data.bStrength;
Strategic/Queen Command.cpp
+5 -2
View File
@@ -1206,9 +1206,12 @@ void AddPossiblePendingEnemiesToBattle()
static UINT8 ubPredefinedInsertionCode = 255; static UINT8 ubPredefinedInsertionCode = 255;
// haydent // haydent
if ((is_client && !is_server) || ENEMY_ENABLED==0) if (is_networked)
{ {
return; if ((is_client && !is_server) || ENEMY_ENABLED==0)
{
return;
}
} }
// check if no world is loaded // check if no world is loaded
Tactical/Soldier Create.h
-1
View File
@@ -272,7 +272,6 @@ public:
BOOLEAN fUseGivenVehicle; BOOLEAN fUseGivenVehicle;
INT8 bUseGivenVehicleID; INT8 bUseGivenVehicleID;
BOOLEAN fHasKeys; BOOLEAN fHasKeys;
INT8 PADDINGSLOTS[ 14 ];
// //
// New and OO stuff goes after here. Above this point any changes will goof up reading from files. // New and OO stuff goes after here. Above this point any changes will goof up reading from files.
Tactical/Tactical.vcproj
+2 -2
View File
@@ -333,7 +333,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer;&quot;..\Standard Gaming Platform&quot;;..\TileEngine;..\;..\Utils;..\tacticalai;..\Editor;..\strategic;..\lua;..\Laptop;.\" AdditionalIncludeDirectories="&quot;..\Standard Gaming Platform&quot;;..\TileEngine;..\;..\Utils;..\tacticalai;..\Editor;..\strategic;..\lua;..\Laptop;.\"
PreprocessorDefinitions="CALLBACKTIMER;PRECOMPILEDHEADERS;_DEBUG;WIN32;_WINDOWS;JA2;_VTUNE_PROFILING;XML_STATIC;CINTERFACE" PreprocessorDefinitions="CALLBACKTIMER;PRECOMPILEDHEADERS;_DEBUG;WIN32;_WINDOWS;JA2;_VTUNE_PROFILING;XML_STATIC;CINTERFACE"
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
@@ -390,7 +390,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OptimizeForProcessor="3" OptimizeForProcessor="3"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories="..\Multiplayer;..\lua;&quot;..\Standard Gaming Platform&quot;;..\TileEngine;..\;..\Utils;..\tacticalai;..\Editor;..\strategic;..\Laptop;.\" AdditionalIncludeDirectories="&quot;..\Standard Gaming Platform&quot;;..\TileEngine;..\;..\Utils;..\tacticalai;..\Editor;..\strategic;..\Laptop;.\"
PreprocessorDefinitions="CALLBACKTIMER;PRECOMPILEDHEADERS;NDEBUG;WIN32;_WINDOWS;JA2;XML_STATIC;CINTERFACE" PreprocessorDefinitions="CALLBACKTIMER;PRECOMPILEDHEADERS;NDEBUG;WIN32;_WINDOWS;JA2;XML_STATIC;CINTERFACE"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
Tactical/Tactical_2005Express.vcproj
-1
View File
@@ -105,7 +105,6 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0" RuntimeLibrary="0"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"