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

Merged revision(s) 6833 from branches/ja2_source_official_2014:

Browse Source 
Fix: on certain conditions, gpCurrentTalkingFace gets garbage values assigned. If BOOLEAN fTalking then does get a value > 0, the incorrect face does not get cleaned.

This worked until now, but we cannot rely on garbage values alone.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-26 18:15:09 +00:00
parent d6186aca15
commit 0c4f5c5df5
1 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+50 -13
View File
@@ -918,9 +918,14 @@ void HandleDialogue( )
gTacticalStatus.ubLastQuoteSaid = (UINT8)QItem->usQuoteNum;
gTacticalStatus.ubLastQuoteProfileNUm = (UINT8)QItem->ubCharacterNum;
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
gubCurrentTalkingID = QItem->ubCharacterNum;
#ifdef JA2UB
//Ja25: test
@@ -979,9 +984,14 @@ void HandleDialogue( )
if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_USE_ALTERNATE_FILES )
{
gfUseAlternateDialogueFile = TRUE;
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
gubCurrentTalkingID = QItem->ubCharacterNum;
ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, QItem->bUIHandlerID, QItem->fFromSoldier );
@@ -992,8 +1002,13 @@ void HandleDialogue( )
// We could have a special flag, but dialogue as well
else if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_PCTRIGGERNPC )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
gubCurrentTalkingID = QItem->ubCharacterNum;
ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, QItem->bUIHandlerID, QItem->fFromSoldier );
@@ -1037,7 +1052,13 @@ void HandleDialogue( )
// Slide to location!
SlideToLocation( 0, QItem->uiSpecialEventData );
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
gubCurrentTalkingID = QItem->ubCharacterNum;
ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, QItem->bUIHandlerID, QItem->fFromSoldier );
@@ -1081,8 +1102,13 @@ void HandleDialogue( )
}
if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_BEGINPREBATTLEINTERFACE )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
gubCurrentTalkingID = QItem->ubCharacterNum;
ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, QItem->bUIHandlerID, QItem->fFromSoldier );
@@ -1198,8 +1224,13 @@ void HandleDialogue( )
if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_MINESECTOREVENT )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
gubCurrentTalkingID = QItem->ubCharacterNum;
// set up the mine highlgith events
@@ -1323,8 +1354,14 @@ void HandleDialogue( )
{
gTacticalStatus.ubLastQuoteSaid = (UINT8)QItem->usQuoteNum;
gTacticalStatus.ubLastQuoteProfileNUm = (UINT8)QItem->ubCharacterNum;
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
// Flugente: only set up face if we can access correctly
if ( QItem->iFaceIndex > 0 )
{
// Setup face pointer
gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
}
gubCurrentTalkingID = QItem->iFaceIndex;
//ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, DIALOGUE_TACTICAL_UI, TRUE );