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

Added additional dialogue call for death of a character (ADE_NPC_DEATH = 16)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-22 19:06:48 +00:00
parent a59d799e03
commit cd5441d875
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.h
+5
View File
@@ -361,6 +361,7 @@ enum AdditionalDialogEvents
ADE_SKILL_RESULT, // we used a skill, and comment on the result ADE_SKILL_RESULT, // we used a skill, and comment on the result
ADE_GRENADEWARNING, // a delayed enemy grenade was dropped nearby ADE_GRENADEWARNING, // a delayed enemy grenade was dropped nearby
ADE_CONSUMEITEM, // we applied an item to us ADE_CONSUMEITEM, // we applied an item to us
ADE_NPC_DEATH, // someone died
}; };
// We call this function from several places. It uses the dialogue functions, but calls a Lua script to know whether something, and what, should be said // We call this function from several places. It uses the dialogue functions, but calls a Lua script to know whether something, and what, should be said
@@ -375,6 +376,10 @@ void AdditionalTacticalCharacterDialogue_AllInSector( INT16 aSectorX, INT16 aSec
void AdditionalTacticalCharacterDialogue_AllInSectorRadiusCall( UINT8 ausIgnoreProfile, UINT16 usEventNr, void AdditionalTacticalCharacterDialogue_AllInSectorRadiusCall( UINT8 ausIgnoreProfile, UINT16 usEventNr,
UINT32 aData1 = 0, UINT32 aData2 = 0, UINT32 aData3 = 0, INT32 aAroundGridno = -1, INT32 aRadius = 0 ); UINT32 aData1 = 0, UINT32 aData2 = 0, UINT32 aData3 = 0, INT32 aAroundGridno = -1, INT32 aRadius = 0 );
void SetQuoteStr( STR16 aStr );
BOOLEAN LuaCallsToDoDialogueStuff( UINT8 ubProfile, INT32 iFaceIndex, const char* azSoundString );
// Flugente: replace text with other text // Flugente: replace text with other text
BOOLEAN ReplaceTextWithOtherText( CHAR16 *pFinishedString, CHAR16 compare[32], CHAR16 replace[32] ); BOOLEAN ReplaceTextWithOtherText( CHAR16 *pFinishedString, CHAR16 compare[32], CHAR16 replace[32] );
Tactical/Soldier Ani.cpp
+7
View File
@@ -4096,6 +4096,13 @@ BOOLEAN HandleSoldierDeath( SOLDIERTYPE *pSoldier , BOOLEAN *pfMadeCorpse )
DeleteVIP( pSoldier->sSectorX, pSoldier->sSectorY ); DeleteVIP( pSoldier->sSectorX, pSoldier->sSectorY );
} }
// Flugente: additional dialogue
if ( pSoldier->ubProfile != NO_PROFILE )
{
AdditionalTacticalCharacterDialogue_AllInSector( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, pSoldier->ubProfile, ADE_NPC_DEATH,
pSoldier->ubProfile, pKillerSoldier ? pKillerSoldier->ubProfile : 0, pSoldier->ubBodyType );
}
// Remove mad as target, one he has died! // Remove mad as target, one he has died!
RemoveManAsTarget( pSoldier ); RemoveManAsTarget( pSoldier );