mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
- bugfix mp: fixed up coop
- bugfix mp: fixed bobby rays code my end git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -818,7 +818,7 @@ void StartNPCAI(SOLDIERTYPE *pSoldier)
|
||||
//SetSoldierAsUnderAiControl( pSoldier );
|
||||
//}
|
||||
|
||||
if (!is_networked)
|
||||
if (!is_networked || is_server)
|
||||
pSoldier->SetSoldierAsUnderAiControl( );
|
||||
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "GameSettings.h"
|
||||
#include "Dialogue Control.h"
|
||||
#endif
|
||||
|
||||
#include "connect.h"
|
||||
#include "Text.h"
|
||||
|
||||
extern BOOLEAN gfHiddenInterrupt;
|
||||
@@ -926,7 +926,7 @@ INT8 DecideActionGreen(SOLDIERTYPE *pSoldier)
|
||||
// CLIMB A BUILDING
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
if (!fCivilian && pSoldier->aiData.bLastAction != AI_ACTION_CLIMB_ROOF)
|
||||
if (!fCivilian && pSoldier->aiData.bLastAction != AI_ACTION_CLIMB_ROOF && !is_networked)
|
||||
{
|
||||
iChance = 10 + pSoldier->aiData.bBypassToGreen;
|
||||
|
||||
|
||||
@@ -890,7 +890,7 @@ void HaltMoveForSoldierOutOfPoints(SOLDIERTYPE *pSoldier)
|
||||
SStopMerc.sYPos=pSoldier->sY;
|
||||
|
||||
//AddGameEvent( S_STOP_MERC, 0, &SStopMerc ); //hayden.
|
||||
if(pSoldier->ubID>=120)
|
||||
if(pSoldier->ubID>=120 || (!is_server && pSoldier->ubID>=20))
|
||||
return;//hayden
|
||||
|
||||
if(is_client)
|
||||
|
||||
Reference in New Issue
Block a user