- 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 -2
View File
@@ -1206,9 +1206,12 @@ void AddPossiblePendingEnemiesToBattle()
static UINT8 ubPredefinedInsertionCode = 255;
// 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