From 8d07ebccc0e5197d172c20f0b333dba98f6623ab Mon Sep 17 00:00:00 2001 From: silversurfer Date: Sun, 9 Feb 2014 08:36:11 +0000 Subject: [PATCH] fixed Skyrider missing face and sticky dialogue text in strategic map git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6892 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Dialogue Control.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 23f86e60..47d99f7c 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -920,7 +920,7 @@ void HandleDialogue( ) gTacticalStatus.ubLastQuoteProfileNUm = (UINT8)QItem->ubCharacterNum; // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -986,7 +986,7 @@ void HandleDialogue( ) gfUseAlternateDialogueFile = TRUE; // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -1003,7 +1003,7 @@ void HandleDialogue( ) else if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_PCTRIGGERNPC ) { // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -1053,7 +1053,7 @@ void HandleDialogue( ) SlideToLocation( 0, QItem->uiSpecialEventData ); // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -1103,7 +1103,7 @@ void HandleDialogue( ) if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_BEGINPREBATTLEINTERFACE ) { // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -1225,7 +1225,7 @@ void HandleDialogue( ) if ( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_MINESECTOREVENT ) { // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ]; @@ -1356,7 +1356,7 @@ void HandleDialogue( ) gTacticalStatus.ubLastQuoteProfileNUm = (UINT8)QItem->ubCharacterNum; // Flugente: only set up face if we can access correctly - if ( QItem->iFaceIndex > 0 ) + if ( QItem->iFaceIndex >= 0 ) { // Setup face pointer gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];