mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Development Trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP A detailed list of all the features (changes) is visible in the history log of the development trunk: INFO: The source code for the official 2011 release (4870) has been branched here: https://ja2svn.dyndns.org/source/ja2/branches/JA2_rev.4870_2011 This commit contains the following features: *** Externalized Vehicles *** o Now with this feature we can add/remove vehicles o New XML File: TableData\Vehicles.xml o Added a new function parameter to lua file Scripts\Overhead lua to set up the helicopter in method: SetUpHelicopterForPlayer() o Added example mini (Docs\Externalized Vehicles Example.zip) mod which adds 2 additional vehicles (hummer and ice-cream truck to sector A9) *** Up to 255 save slots *** - There is a "Next" and "Prev" button where you can scroll through the save slots - It is now possible to load the automatic save (SAVE_EVERY_N_HOURS) from the load screen. This is the first slot after the quickload slot - Added the 2 alternate players end turn saves (which can be enabled/disabled in option screen) to the save/load game form *** New Feature: Externalized emails from Emails.edt to XML*** o This feature can be enabled/disabled in the Source: --> See email.cpp: If "ReadXMLEmail" == FALSE, then normal way (read from Email.edt) otherwise read from XML files o 2 new XML files: TableData\Email\EmailMercAvailable.xml and EmailMercLevelUp.xml o Renamed SenderNamesList.xml to EmailSenderNamesList.xml and moved from TableData folder to TableData\Email folder o Names for mercenaries are get from the file MercProfiles.xml and different names get from the file EmailSenderNamesList.xml *** Externalized Hidden Towns (Tixa, Orta) *** o Now it is possible to add new hidden towns (locations) o See file: TableData/Map/Cities.xml o New variable in TableData/Map/Cities.xml - hiddenTown: 0 = show on strategy map, 1 = Hide on strategy map - townIcon: 1 = on, 0 = off (This is the icon you see on the strategy map) - szIconFile: The path to the sti icon file (eg: interface\prison.sti, interface\my_icon.sti) - iconPosition: The x,y position of the icon on the strategy map *** Encyclopedia and Briefing Room, reachable from the laptop *** o 2 new ja2_options.ini properties: BRIEFING_ROOM, ENCYCLOPEDIA o demonstration video: http://www.youtube.com/watch?v=7CIXdXWLrAo o Added Example usage of the Briefing Room - Extract it in your JA2 1.13 folder and use the latest development executable - The briefing room can be reached from the laptop. Enter SN5631 for the code and then click the "Exit" button - See "Info_BriefingRoom.txt" and "BriefingRoom_Mission1.png" *** Improved interrupt system (IIS) *** o This system changes the way interrupts work. See: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290787#Post290787 o Option system (see ja2_options.ini: IMPROVED_INTERRUPT_SYSTEM) o A few more settings for the interrupt system in ja2_options.ini o INFO: Multiplayer games always use the "old" interrupt system, not matter what the user selects in the ja2_options.ini *** Walking and sidestepping with weapon raised *** o Enable/disable the walking/sidestepping with raised weapon in ja2_options.ini: ALLOW_WALKING_WITH_WEAPON_RAISED o You can set an AP/BP modifier when walking/sidestepping with weapon raised in APBPConstants.ini: AP_MODIFIER_WEAPON_READY o The following feature apply when you walk/sidestep with weapon raised: -> limited angle of view, but you can see more farther when the weapon has a scope -> better change for interrupts if you see an enemy -> less APs and BPs when shooting, because the weapon is already raised -> It should cost more APs when walking. Maybe you can export the additional AP and BP modifier to the APBPConstants.ini *** Increase squad size to 8 (800x600) and 8 and 10 (1024x768) *** o Squad sizes (dependend on the screen resolution) can be selected in the start new game screen o In a multiplayer game, the squad size will always be 6, because it does not work with more soldiers/squad *** Added UB-1.13 source code *** o Merged the UB-1.13 source code (Revision: 4721) from svn: http://subversion.assembla.com/svn/ub-source113 o If you want to build UB-EXE or UB-MapEditor, just enable the 2 defines (JA2UB and JA2UBMAPS) in "builddefines.h" o The UB-Verion reads from "ja2_UB.ini" instead of "ja2.ini" o There are 2 new XML files - Layout\LayoutMainMenu.xml - MapAction\ActionItems.xml o There are 2 new LUA-Script files - Scripts\ExplosionControl.lua - Scripts\InterfaceDialogue.lua *** Hide enemy health text / enemy hit count *** o ja2_options.ini: HIDE_ENEMY_HEALTH_TEXT, HIDE_ENEMY_HIT_COUNT o both new settings only have effect in a singleplayer game o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=128840&page=1 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
486 lines
12 KiB
C++
486 lines
12 KiB
C++
#ifdef PRECOMPILEDHEADERS
|
|
#include "Strategic All.h"
|
|
#else
|
|
#include "Map Screen Interface.h"
|
|
#include "string.h"
|
|
#include "Map Screen Interface Map.h"
|
|
#include "Render Dirty.h"
|
|
#include "Font Control.h"
|
|
#include "Assignments.h"
|
|
#include "Soldier Control.h"
|
|
#include "Overhead.h"
|
|
#include "Squads.h"
|
|
#include "Sound Control.h"
|
|
#include "Soundman.h"
|
|
#include "Message.h"
|
|
#include "PopUpBox.h"
|
|
#include "Game Clock.h"
|
|
#include "Handle Items.h"
|
|
#include "Interface Items.h"
|
|
#include "Isometric Utils.h"
|
|
#include "Interface.h"
|
|
#include "Game Event Hook.h"
|
|
#include "Tactical Save.h"
|
|
#include "Quests.h"
|
|
#include "Strategicmap.h"
|
|
#include "Soldier Profile.h"
|
|
#include "Strategic Movement.h"
|
|
#include "Dialogue Control.h"
|
|
#include "Map Screen Interface Border.h"
|
|
#include "Map Screen Interface Bottom.h"
|
|
#include "Vehicles.h"
|
|
#include "LINE.H"
|
|
#include "Text.h"
|
|
#include "gameloop.h"
|
|
#include "Map Screen Helicopter.h"
|
|
#include "PreBattle Interface.h"
|
|
#include "WordWrap.h"
|
|
#include "interface control.h"
|
|
#include "GameSettings.h"
|
|
#include "Campaign Types.h"
|
|
#include "Map Screen Interface Map Inventory.h"
|
|
#include "strategic.h"
|
|
#include "Keys.h"
|
|
#include "Soldier macros.h"
|
|
#include "Militia Control.h"
|
|
#include "Random.h"
|
|
#include "Cursor Control.h"
|
|
#include "renderworld.h"
|
|
#include "Game Init.h"
|
|
#include "Strategic Mines.h"
|
|
#include "finances.h"
|
|
#include "strategic.h"
|
|
#include "Air Raid.h"
|
|
#include "Queen Command.h"
|
|
#include "Render Fun.h"
|
|
#endif
|
|
|
|
#include "connect.h"
|
|
|
|
#ifdef JA2UB
|
|
|
|
#include "Ja25 Strategic Ai.h"
|
|
#include "Ja25_Tactical.h"
|
|
#include "ub_config.h"
|
|
#include "Ja25Update.h"
|
|
|
|
|
|
#include "MapScreen Quotes.h"
|
|
//****** Global Variables *****************************************
|
|
|
|
UINT16 gusWaitingQuote=MILO_NO_QUOTE;
|
|
UINT16 gusJerryDialogueDelay = 0;
|
|
|
|
|
|
|
|
//******* Function Prototypes ***************************************
|
|
|
|
BOOLEAN Internal_JerryMeloCharacterDialogue( UINT16 usQuoteNum );
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained();
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained2ndTime();
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasComplained2ndTime();
|
|
BOOLEAN DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet();
|
|
//BOOLEAN DoesPlayerHaveExactly6MercsOrLessThen6MercsAndJerryHasDoubleChecked();
|
|
BOOLEAN DoesPlayerHaveLessThen6MercsAndJerryHasDoubleChecked();
|
|
BOOLEAN DoesPlayerHaveExactly6MercsAndNotSaidQuoteBefore();
|
|
BOOLEAN HasJerryAlreadySaidTheMapScreenIntroSequence();
|
|
BOOLEAN HasJerrySaidTheLetsGoToTraconaQuote();
|
|
|
|
|
|
//ppp
|
|
|
|
//******* Functions **************************************************
|
|
|
|
|
|
//void JerryMiloTalk( UINT16 usQuoteNum, UINT32 uiDelay )
|
|
void JerryMiloTalk( UINT16 usQuoteNum )
|
|
{
|
|
// gusWaitingQuote = usQuoteNum;
|
|
|
|
// have skyrider talk to player
|
|
Internal_JerryMeloCharacterDialogue( usQuoteNum );
|
|
|
|
//set that jerry has said the quote
|
|
JerryMiloSaidQuote( usQuoteNum );
|
|
|
|
return;
|
|
}
|
|
|
|
void JerryMiloDelayedTalk( UINT16 usQuoteNum, UINT32 uiDelay )
|
|
{
|
|
gusWaitingQuote = usQuoteNum;
|
|
gusJerryDialogueDelay = uiDelay;
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
void HandleJerryMiloQuotes( BOOLEAN fReset )
|
|
{
|
|
|
|
static UINT32 uiLastCount;
|
|
UINT32 uiCurrentTime = GetJA2Clock();
|
|
|
|
|
|
if( fReset )
|
|
{
|
|
uiLastCount = 0;
|
|
gusWaitingQuote = MILO_NO_QUOTE;
|
|
return;
|
|
}
|
|
|
|
// if ( gGameUBOptions.InGameHeliCrash == TRUE )
|
|
// {
|
|
|
|
// return;//AA
|
|
if( gusWaitingQuote == MILO_NO_QUOTE )
|
|
{
|
|
return;
|
|
}
|
|
|
|
if( uiLastCount == 0 )
|
|
{
|
|
uiLastCount = GetJA2Clock();
|
|
return;
|
|
}
|
|
|
|
if( ( uiCurrentTime - uiLastCount ) > gusJerryDialogueDelay )
|
|
{
|
|
JerryMiloTalk( gusWaitingQuote );
|
|
|
|
//if the quote waiting to be said was the opening quote
|
|
if( gusWaitingQuote == MILO_QUOTE__OPENING_GREETING_PART_1 )
|
|
{
|
|
//say the follow up part
|
|
if( DoesPlayerHaveExactly6MercsAndNotSaidQuoteBefore() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__ALREADY_HAS_6_MERCS );
|
|
}
|
|
else
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__OPENING_GREETING_PART_2 );
|
|
}
|
|
}
|
|
|
|
gusWaitingQuote = MILO_NO_QUOTE;
|
|
|
|
uiLastCount = uiCurrentTime;
|
|
}
|
|
|
|
// }
|
|
}
|
|
|
|
BOOLEAN Internal_JerryMeloCharacterDialogue( UINT16 usQuoteNum )
|
|
{
|
|
BOOLEAN fRetVal = FALSE;
|
|
fTeamPanelDirty = TRUE;
|
|
|
|
fRetVal = CharacterDialogue( 76, usQuoteNum, uiExternalStaticNPCFacesUB[ JERRY_MELO_FACE ], DIALOGUE_EXTERNAL_NPC_UI, FALSE, FALSE );
|
|
|
|
SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_JERRY_MILO, usQuoteNum, 0, 0, uiExternalStaticNPCFacesUB[ JERRY_MELO_FACE ], DIALOGUE_EXTERNAL_NPC_UI );
|
|
|
|
return( fRetVal );
|
|
}
|
|
|
|
BOOLEAN HasJerryMiloSaidQuoteBefore( UINT32 uiQuoteID )
|
|
{
|
|
//has the quote been said
|
|
return( ( gJa25SaveStruct.uiJerryMiloQuotesFlags & ( 1 << uiQuoteID ) ) != 0 );
|
|
}
|
|
|
|
|
|
void JerryMiloSaidQuote( UINT32 uiQuoteID )
|
|
{
|
|
gJa25SaveStruct.uiJerryMiloQuotesFlags |= ( 1 << uiQuoteID );
|
|
}
|
|
|
|
|
|
BOOLEAN WillJerryMiloAllowThePlayerToCompressTimeAtBeginingOfGame()
|
|
{
|
|
|
|
if ( gGameUBOptions.JerryQuotes == TRUE )
|
|
{
|
|
//to speed things up, has jerry finished the intro speech?
|
|
if( HasJerryAlreadySaidTheMapScreenIntroSequence() )
|
|
return( TRUE );
|
|
|
|
|
|
//if the player has more then 6merc and Jerry hasnt complained the first time
|
|
if( DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
//if the player has over 6 mercs and jerry HAS NOT complained the 2nd time
|
|
if( DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained2ndTime() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
//if the player has over 6 mercs and jerry HAS complained the 2nd time
|
|
if( DoesPlayerHaveMoreThen6MercsAndJerryHasComplained2ndTime() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
//if the player has less then 6 mercs, and hasnt double checked yet
|
|
if( DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
/*
|
|
//if the player has exactly 6 mercs OR the player has less then 6 AND has double checked
|
|
if( DoesPlayerHaveExactly6MercsOrLessThen6MercsAndJerryHasDoubleChecked() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
*/
|
|
|
|
//if the player has exactly 6 mercs OR the player has less then 6 AND has double checked
|
|
if( DoesPlayerHaveLessThen6MercsAndJerryHasDoubleChecked() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
//if the player has exactly 6 mercs OR the player has less then 6 AND has double checked
|
|
if( DoesPlayerHaveExactly6MercsAndNotSaidQuoteBefore() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
|
|
if( !HasJerrySaidTheLetsGoToTraconaQuote() )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
}
|
|
return( TRUE );
|
|
}
|
|
|
|
BOOLEAN HasJerrySaidTheLetsGoToTraconaQuote()
|
|
{
|
|
return( HasJerryMiloSaidQuoteBefore( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE ) );
|
|
}
|
|
|
|
void HaveJerrySayWhyPlayerCantTimeCompressAtBeginningOfGame()
|
|
{
|
|
if( !gfFirstTimeInGameHeliCrash)
|
|
{
|
|
INT32 i=0;
|
|
}
|
|
|
|
/*
|
|
if (gGameOptions.ubSquadSize > 6)
|
|
{
|
|
if( DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS );
|
|
return;
|
|
}
|
|
//else if the player has less then 6 mercs, and hasnt double checked yet
|
|
else if( DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS );
|
|
return;
|
|
}
|
|
//if the player has less then 6 AND has double checked
|
|
else if( DoesPlayerHaveLessThen6MercsAndJerryHasDoubleChecked() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE );
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE );
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
*/
|
|
{
|
|
//if the player has more then 6merc and Jerry hasnt complained the first time
|
|
if( DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS );
|
|
return;
|
|
}
|
|
|
|
//else if the player has over 6 mercs and jerry HAS NOT complained the 2nd time
|
|
else if( DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained2ndTime() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS_2ND_TIME );
|
|
return;
|
|
}
|
|
|
|
//else if the player has over 6 mercs and jerry HAS complained the 2nd time
|
|
else if( DoesPlayerHaveMoreThen6MercsAndJerryHasComplained2ndTime() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS_2ND_TIME );
|
|
return;
|
|
}
|
|
|
|
//else if the player has less then 6 mercs, and hasnt double checked yet
|
|
else if( DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS );
|
|
return;
|
|
}
|
|
|
|
//if the player has less then 6 AND has double checked
|
|
else if( DoesPlayerHaveLessThen6MercsAndJerryHasDoubleChecked() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE );
|
|
return;
|
|
}
|
|
|
|
else if( !HasJerrySaidTheLetsGoToTraconaQuote() )
|
|
{
|
|
JerryMiloTalk( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE );
|
|
return;
|
|
}
|
|
}
|
|
|
|
//shoud satisfy condition above
|
|
Assert( 0 );
|
|
}
|
|
|
|
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has over 6 mercs, and jerry hasnt complained about that yet
|
|
if( ubNumMercsOnTeam > 6 && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasntComplained2ndTime()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has over 6 mercs and jerry HAS NOT complained the 2nd time
|
|
if( ubNumMercsOnTeam > 6 && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS_2ND_TIME ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
BOOLEAN DoesPlayerHaveMoreThen6MercsAndJerryHasComplained2ndTime()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has over 6 mercs and jerry HAS complained the 2nd time
|
|
if( ubNumMercsOnTeam > 6 && HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_MORE_THEN_6_MERCS_2ND_TIME ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
BOOLEAN DoesPlayerHaveLessThen6MercsAndJerryHasNotDoubleCheckedYet()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has less then 6 mercs, and hasnt double checked yet
|
|
if( ubNumMercsOnTeam < 6 && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
BOOLEAN DoesPlayerHaveExactly6MercsAndNotSaidQuoteBefore()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has exactly 6 mercs OR the player has less then 6 AND has double checked
|
|
if( ubNumMercsOnTeam == 6 && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__ALREADY_HAS_6_MERCS ) && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
|
|
BOOLEAN DoesPlayerHaveLessThen6MercsAndJerryHasDoubleChecked()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has exactly 6 mercs OR the player has less then 6 AND has double checked
|
|
if( ubNumMercsOnTeam < 6 && HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_LESS_THEN_6_MERCS ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
|
|
BOOLEAN DoesPlayerHaveNoMercsHiredAndJerryHasntSaidQuoteYet()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//if the player has less then 6 mercs, and hasnt double checked yet
|
|
//if( ubNumMercsOnTeam == 0 && !HasJerryMiloSaidQuoteBefore( MILO_QUOTE__PLAYER_HAS_NO_MERCS ) )
|
|
if( ubNumMercsOnTeam == 0 )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
BOOLEAN DidPlayerInitiallyHaveLessThen6MercsAndNowHaveExactly6AndHasntSaidFullLoadQuote()
|
|
{
|
|
UINT8 ubNumMercsOnTeam = NumberOfMercsOnPlayerTeam();
|
|
|
|
//If we have been to the sector, make sure we dont say it
|
|
|
|
//if( SectorInfo[ SEC_H7].uiFlags & SF_HAS_ENTERED_TACTICAL )
|
|
if( SectorInfo[ (UINT8)SECTOR( gGameExternalOptions.ubDefaultArrivalSectorX, gGameExternalOptions.ubDefaultArrivalSectorY ) ].uiFlags & SF_HAS_ENTERED_TACTICAL )
|
|
{
|
|
return( FALSE );
|
|
}
|
|
|
|
//if the player has 6 mercs, and has said the regular opening line ( not the line with 6 mercs )
|
|
if( ubNumMercsOnTeam == 6 &&
|
|
HasJerryMiloSaidQuoteBefore( MILO_QUOTE__OPENING_GREETING_PART_2 ) &&
|
|
!HasJerryMiloSaidQuoteBefore( MILO_QUOTE__ALREADY_HAS_6_MERCS ) )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
|
|
return( FALSE );
|
|
}
|
|
|
|
|
|
void InitJerryQuotes()
|
|
{
|
|
//Clear out the quote flags
|
|
gJa25SaveStruct.uiJerryMiloQuotesFlags = 0;
|
|
}
|
|
|
|
BOOLEAN HasJerryAlreadySaidTheMapScreenIntroSequence()
|
|
{
|
|
// return TRUE; //AA
|
|
if( HasJerryMiloSaidQuoteBefore( MILO_QUOTE__HEADED_TO_TRACONA_QUOTE ) || gGameUBOptions.InGameHeliCrash == FALSE )
|
|
{
|
|
return( TRUE );
|
|
}
|
|
else
|
|
{
|
|
return( FALSE );
|
|
}
|
|
}
|
|
|
|
#endif |