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

interrogation cutscene will no longer be started if player fired all POW soldiers that were scheduled to appear there

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-20 14:24:15 +00:00
parent a7d7f4b93b
commit 76429a09b6
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Meanwhile.cpp
+36 -12
View File
@@ -411,25 +411,49 @@ void CheckForMeanwhileOKStart( )
return; return;
} }
if ( !DialogueQueueIsEmptyOrSomebodyTalkingNow( ) ) if ( !DialogueQueueIsEmptyOrSomebodyTalkingNow( ) )
{ {
return; return;
} }
//shadooow: prevent the interrogation meanwhile to start if the mercs were fired from team
if (gCurrentMeanwhileDef.ubMeanwhileID == INTERROGATION)
{
SOLDIERTYPE *pSoldier;
BOOLEAN fFoundSoldierToInterrogate = FALSE;
UINT32 uiCount = 0;
for (pSoldier = MercPtrs[gCharactersList[uiCount].usSolID]; gCharactersList[uiCount].fValid; uiCount++, pSoldier++)
{
if (pSoldier->sSectorX == gModSettings.ubMeanwhileInterrogatePOWSectorX && pSoldier->sSectorY == gModSettings.ubMeanwhileInterrogatePOWSectorY &&
pSoldier->bSectorZ == 0 && pSoldier->bAssignment == ASSIGNMENT_POW && pSoldier->stats.bLife > 0 && gMercProfiles[pSoldier->ubProfile].bMercStatus != MERC_FIRED_AS_A_POW)
{
fFoundSoldierToInterrogate = TRUE;
break;
}
}
if (!fFoundSoldierToInterrogate)
{
gfMeanwhileTryingToStart = FALSE;
ProcessImplicationsOfMeanwhile();
UnLockPauseState();
UnPauseGame();
return;
}
}
gfMeanwhileTryingToStart = FALSE; gfMeanwhileTryingToStart = FALSE;
guiOldScreen = guiCurrentScreen; guiOldScreen = guiCurrentScreen;
if ( guiCurrentScreen == GAME_SCREEN ) if ( guiCurrentScreen == GAME_SCREEN )
{ {
LeaveTacticalScreen( GAME_SCREEN ); LeaveTacticalScreen( GAME_SCREEN );
} }
// We need to make sure we have no item - at least in tactical
// In mapscreen, time is paused when manipulating items...
// We need to make sure we have no item - at least in tactical CancelItemPointer( );
// In mapscreen, time is paused when manipulating items...
CancelItemPointer( );
BringupMeanwhileBox( ); BringupMeanwhileBox( );
} }