Merged Multi Player Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-05-12 08:20:47 +00:00
parent c448713412
commit 3e22dce318
132 changed files with 14527 additions and 4859 deletions
+13 -2
View File
@@ -11,6 +11,7 @@
#include "overhead.h"
#include "math.h"
#include "Event Pump.h"
#include "Soldier Control.h"
#include "Overhead Types.h"
#include "sys globals.h"
#include "opplist.h"
@@ -55,6 +56,8 @@
#include "cheats.h"
#endif
#include "connect.h"
extern void PauseAITemporarily( void );
extern void UpdateEnemyUIBar( void );
extern void DisplayHiddenTurnbased( SOLDIERTYPE * pActingSoldier );
@@ -808,8 +811,16 @@ void StartNPCAI(SOLDIERTYPE *pSoldier)
if(!gfAmIHost)
return;
#endif
//pSoldier->flags.uiStatusFlags |= SOLDIER_UNDERAICONTROL;
pSoldier->SetSoldierAsUnderAiControl( );
////pSoldier->flags.uiStatusFlags |= SOLDIER_UNDERAICONTROL;
//if (!(pSoldier->flags.uiStatusFlags & SOLDIER_PC))
//{
//SetSoldierAsUnderAiControl( pSoldier );
//}
if (!is_networked)
pSoldier->SetSoldierAsUnderAiControl( );
pSoldier->flags.fTurnInProgress = TRUE;