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

- UB Improvements / Cleanup (by Jazz)

Browse Source 
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-28 17:06:43 +00:00
parent ee8d4f6eb9
commit a5abf4d91a
23 changed files with 255 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.cpp
+8 -8
View File
@@ -727,9 +727,9 @@ void HandleDialogue( )
UINT8 ubNumQualifiedMercs=0;
UINT8 ubCnt=0;
if( !( gMercProfiles[ 75 ].ubMiscFlags2 & PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE ) )
if( !( gMercProfiles[ MORRIS_UB ].ubMiscFlags2 & PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE ) )
{
pMorris = FindSoldierByProfileID( 75, FALSE );
pMorris = FindSoldierByProfileID( MORRIS_UB, FALSE );
if ( pMorris && pMorris->stats.bLife >= OKLIFE )
{
sPlayerGridNo = ClosestPC( pMorris, NULL );
@@ -765,7 +765,7 @@ void HandleDialogue( )
//Morris should say a new quote
// CharacterDialogue( MORRIS, QUOTE_ATTACKED_BY_MULTIPLE_CREATURES, gTalkPanel.iFaceIndex, DIALOGUE_NPC_UI, FALSE, FALSE );
TriggerNPCRecord( 75, 2 );
TriggerNPCRecord( MORRIS_UB, 2 );
gfMorrisShouldSayHi = FALSE;
}
@@ -920,7 +920,7 @@ void HandleDialogue( )
gubCurrentTalkingID = QItem->ubCharacterNum;
#ifdef JA2UB
//Ja25: test
if( QItem->ubCharacterNum == 75 ) //MORRIS
if( QItem->ubCharacterNum == MORRIS_UB ) //MORRIS
{
if( QItem->usQuoteNum == 0 )
{
@@ -1333,7 +1333,7 @@ void HandleDialogue( )
pSoldier->ChangeSoldierStance( ANIM_STAND );
//if the soldier is Jerry
if( FindSoldierByProfileID( 76, FALSE ) == pSoldier ) //JERRY
if( FindSoldierByProfileID( JERRY_MILO_UB, FALSE ) == pSoldier ) //JERRY
{
//Play the sound of the Antena breaking
PlayJA2SampleFromFile( "SOUNDS\\Metal Antenna Crunch.wav", RATE_11025, HIGHVOLUME, 1, MIDDLE );
@@ -1349,7 +1349,7 @@ void HandleDialogue( )
//AA
//if ( gGameUBOptions.InGameHeliCrash == TRUE )
if ( gGameUBOptions.JerryQuotes == TRUE )
DelayedMercQuote( 76 , 0xffff, 4 ); //JERRY
DelayedMercQuote( JERRY_MILO_UB , 0xffff, 4 ); //JERRY
//End the ui Lock
guiPendingOverrideEvent = LU_ENDUILOCK;
@@ -3294,7 +3294,7 @@ BOOLEAN AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes()
}
//See if Jerry is still waiting to get up
pSoldier = FindSoldierByProfileID( 76, FALSE );
pSoldier = FindSoldierByProfileID( JERRY_MILO_UB, FALSE );
if( pSoldier )
{
//if the merc is still not done the initial speech, and still prone
@@ -3312,7 +3312,7 @@ BOOLEAN AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes()
void InitJerriesSpeechCallBack()
{
//Trigger Jerry Milo's script record 10 ( call action 301 )
TriggerNPCRecord( 76, 10 );
TriggerNPCRecord( JERRY_MILO_UB, 10 );
//Clear the overlay
RemoveJerryMiloBrokenLaptopOverlay();