Disabled auto fast forwarding for talking faces.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2019-08-13 22:00:49 +00:00
parent c7cac0dff2
commit afb0c368b9
2 changed files with 26 additions and 3 deletions
+5
View File
@@ -11224,6 +11224,8 @@ BOOLEAN GetRandomUnknownVIPSector( UINT16& aSector )
return FALSE;
}
extern FACETYPE *gpCurrentTalkingFace;
void UpdateFastForwardMode(SOLDIERTYPE* pSoldier, INT8 bAction)
{
BOOLEAN fAction = FALSE;
@@ -11262,6 +11264,9 @@ void UpdateFastForwardMode(SOLDIERTYPE* pSoldier, INT8 bAction)
pSoldier->flags.uiStatusFlags & SOLDIER_PC ||
pSoldier->bVisible == TRUE ||
gTacticalStatus.ubCurrentTeam == gbPlayerNum ||
gTacticalStatus.bBoxingState != NOT_BOXING ||
gTacticalStatus.uiFlags & ENGAGED_IN_CONV ||
gpCurrentTalkingFace != NULL && gpCurrentTalkingFace->fTalking ||
fAction)
{
if (IsFastForwardMode())