1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disabled auto fast forwarding for talking faces.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+21 -3
View File
@@ -1829,6 +1829,12 @@ BOOLEAN CharacterDialogueWithSpecialEvent( UINT8 ubCharacterNum, UINT16 usQuoteN
// Add to queue
ghDialogueQ = AddtoQueue( ghDialogueQ, &QItem );
// sevenfm: disable FF for dialogues
if (IsFastForwardMode())
{
SetFastForwardMode(FALSE);
}
if ( uiFlag & DIALOGUE_SPECIAL_EVENT_PCTRIGGERNPC )
{
// Increment refrence count...
@@ -1908,13 +1914,19 @@ BOOLEAN CharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 iFaceI
AdditionalTacticalCharacterDialogue_CallsLua( MercPtrs[gusSelectedSoldier], ADE_DIALOGUE_REACTION, ubCharacterNum, usQuoteNum, ( gMercProfiles[ubCharacterNum].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) ? 1 : 0 );
}
}
// if teammembers talk, anyone may answer
// if team members talk, anyone may answer
else
{
// other teammembers might react to this line
// other team members might react to this line
AdditionalTacticalCharacterDialogue_AllInSector( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, ubCharacterNum, ADE_DIALOGUE_REACTION, ubCharacterNum, usQuoteNum, ( gMercProfiles[ubCharacterNum].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) ? 1 : 0 );
}
// sevenfm: disable FF for dialogues
if (IsFastForwardMode())
{
SetFastForwardMode(FALSE);
}
return( TRUE );
}
@@ -2131,6 +2143,12 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
return( FALSE );
}
// sevenfm: stop high speed timer for any talking face
if (IsFastForwardMode())
{
SetFastForwardMode(FALSE);
}
if( bUIHandlerID == DIALOGUE_EXTERNAL_NPC_UI )
{
// external NPC
@@ -2144,7 +2162,7 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32
// pSoldier can be null here... ( if NOT from an alive soldier )
CreateTalkingUI( bUIHandlerID, iFaceIndex, ubCharacterNum, pSoldier, gzQuoteStr );
// Set global handleer ID value, used when face desides it's done...
// Set global handler ID value, used when face desides it's done...
gbUIHandlerID = bUIHandlerID;
guiScreenIDUsedWhenUICreated = guiCurrentScreen;
Tactical/Overhead.cpp
+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())