1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Surrender GUI when talking to boxing opponent replaced with MessageBox allowing to forfeit the match.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2022-01-01 13:33:34 +00:00
parent 9737bd9255
commit 1749d3adfb
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+15
View File
@@ -23300,6 +23300,15 @@ void MercStealFromMerc( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pTarget )
}
}
void AbandonBoxingDueToSurrenderCallback(UINT8 ubExitValue)
{
if (ubExitValue == MSG_BOX_RETURN_YES)
{
SetBoxingState(DISQUALIFIED);
TriggerNPCRecord(DARREN, 21);
}
}
SOLDIERTYPE *pTMilitiaSoldier;//global pointer
BOOLEAN SOLDIERTYPE::PlayerSoldierStartTalking( UINT8 ubTargetID, BOOLEAN fValidate )
{
@@ -23374,6 +23383,12 @@ BOOLEAN SOLDIERTYPE::PlayerSoldierStartTalking( UINT8 ubTargetID, BOOLEAN fValid
if ( (gSkillTraitValues.fCOTurncoats || gGameExternalOptions.fEnemyCanSurrender || gGameExternalOptions.fPlayerCanAsktoSurrender) && pTSoldier->CanBeCaptured( ) )
{
// AP costs are handled inside the callback (PrisonerSurrenderMessageBoxCallBack)
if (gTacticalStatus.bBoxingState != NOT_BOXING)
{
// pop up dialogue asking whether the player wants to abandon the fight
DoMessageBox(MSG_BOX_BASIC_STYLE, Message[STR_ABANDON_FIGHT], GAME_SCREEN, (UINT8)MSG_BOX_FLAG_YESNO, AbandonBoxingDueToSurrenderCallback, NULL);
return FALSE;
}
HandleSurrenderOffer( pTSoldier );
return(FALSE);
}