- fixed map editor incompatibility with the merged multiplayer code

- 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
+5 -1
View File
@@ -881,7 +881,11 @@ void recieveAI (RPCParameters *rpcParameters)
new_standard_data.bMedical = send_inv->standard_data.bMedical;
new_standard_data.bMorale = send_inv->standard_data.bMorale;
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.bSectorZ = send_inv->standard_data.bSectorZ;
new_standard_data.bStrength = send_inv->standard_data.bStrength;