MERGED source code from development trunk revision 4545 up to latest current revision 4882

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
2026-07-29 13:52:17 +02:00 · 2012-01-18 11:19:01 +00:00
parent c42d68ff0f
commit e64d5a2fa6
264 changed files with 40710 additions and 2771 deletions
@@ -61,6 +61,15 @@
 #include "Auto Resolve.h"

 #include "connect.h"
+#ifdef JA2UB
+#include "Intro.h"
+#include "MapScreen Quotes.h"
+#include "Ja25 Strategic Ai.h"
+#include "Ja25_Tactical.h"
+#include "Animation Control.h"
+#endif
+
+#include "ub_config.h"

 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
@@ -128,6 +137,24 @@ std::vector<UINT32> uiExternalStaticNPCFaces;
 //	157,
 //	158,
 //};
+#ifdef JA2UB
+UINT32 uiExternalStaticNPCFacesUB[ NUMBER_OF_EXTERNAL_NPC_FACES ];
+UINT32 uiExternalFaceProfileIdsUB[ NUMBER_OF_EXTERNAL_NPC_FACES ]=
+{
+	97,
+	106,
+	148,
+	156,
+	157,
+	158,
+	76,					//Jerry Melo
+};
+
+
+BOOLEAN AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes();
+void		InitJerriesSpeechCallBack();
+void		HandlePlayerClosingMorrisNoteDisplayedOnScreen();
+#endif

 UINT8	gubMercValidPrecedentQuoteID[ NUMBER_VALID_MERC_PRECEDENT_QUOTES ] =
 					{ 80, 81, 82, 83, 86, 87, 88, 95, 97, 99, 100, 101, 102 };
@@ -217,6 +244,11 @@ void HandleTacticalSpeechUI( UINT8 ubCharacterNum, INT32 iFaceIndex );
 void DisplayTextForExternalNPC(	UINT8 ubCharacterNum, STR16 zQuoteStr );
 void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, STR16 zQuoteStr );

+#ifdef JA2UB
+BOOLEAN AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes();
+void		InitJerriesSpeechCallBack();
+void		HandlePlayerClosingMorrisNoteDisplayedOnScreen();
+#endif

 void HandleExternNPCSpeechFace( INT32 iIndex );

@@ -310,6 +342,13 @@ void InitalizeStaticExternalNPCFaces( void )
 	//
 	// Code for loading miners' faces has been moved to LuaMines::InitMinerFaces ...
 	//
+#ifdef JA2UB
+	for( iCounter = 0; iCounter < NUMBER_OF_EXTERNAL_NPC_FACES; iCounter++ )
+	{
+		uiExternalStaticNPCFacesUB[ iCounter ] = ( UINT32 )InitFace( ( UINT8 )( uiExternalFaceProfileIdsUB[ iCounter ] ), NOBODY, FACE_FORCE_SMALL );
+	}
+#endif
+
 	//for( iCounter = 0; iCounter < NUMBER_OF_EXTERNAL_NPC_FACES; iCounter++ )
 	//{
 	//	uiExternalStaticNPCFaces[ iCounter ] = ( UINT32 )InitFace( ( UINT8 )( uiExternalFaceProfileIds[ iCounter ] ), NOBODY, FACE_FORCE_SMALL );
@@ -336,6 +375,14 @@ void ShutdownStaticExternalNPCFaces( void )
 	//{
 	//	DeleteFace( uiExternalStaticNPCFaces[ iCounter ] );
 	//}
+
+#ifdef JA2UB
+	for( iCounter = 0; iCounter < NUMBER_OF_EXTERNAL_NPC_FACES; iCounter++ )
+	{
+		DeleteFace( uiExternalStaticNPCFacesUB[ iCounter ] );
+	}
+#endif
+
 	for (std::vector<UINT32>::iterator face = uiExternalStaticNPCFaces.begin();
 		face != uiExternalStaticNPCFaces.end(); ++face)
 	{
@@ -425,6 +472,9 @@ void StopAnyCurrentlyTalkingSpeech( )
 	{
 		InternalShutupaYoFace( gpCurrentTalkingFace->iID, TRUE );
 	}
+#ifdef JA2UB	
+	RemoveJerryMiloBrokenLaptopOverlay();
+#endif
 }


@@ -664,6 +714,68 @@ void HandleDialogue( )
 		UnPauseGame();

 	}
+	
+#ifdef JA2UB	
+	if ( iQSize == 0 )
+	{
+		if( gfMorrisShouldSayHi )
+		{
+			SOLDIERTYPE * pMorris;
+			SOLDIERTYPE * pSoldier;
+			INT16	sPlayerGridNo;
+			UINT8	ubPlayerID;
+			UINT8	ubQualifiedSoldierIDArray[ NUM_MERCS_WITH_NEW_QUOTES ];
+			UINT8	ubNumQualifiedMercs=0;
+			UINT8	ubCnt=0;
+
+			if( !( gMercProfiles[ 75 ].ubMiscFlags2 & PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE ) )
+			{
+				pMorris = FindSoldierByProfileID( 75, FALSE );
+				if ( pMorris && pMorris->stats.bLife >= OKLIFE )
+				{
+					sPlayerGridNo = ClosestPC( pMorris, NULL );
+					if (sPlayerGridNo != NOWHERE )
+					{
+						ubPlayerID = WhoIsThere2( sPlayerGridNo, 0 );
+						if (ubPlayerID != NOBODY)
+						{
+							InitiateConversation( pMorris, MercPtrs[ ubPlayerID ], NPC_INITIAL_QUOTE, 0 );
+							gMercProfiles[ pMorris->ubProfile ].ubMiscFlags2 |= PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE;
+						}
+					}
+				}
+			}
+			else
+			{
+				//Get the # of qualified mercs
+				ubNumQualifiedMercs = GetNumSoldierIdAndProfileIdOfTheNewMercsOnPlayerTeam( ubQualifiedSoldierIDArray, NULL );
+
+				//if there is some qualified mercs
+				if( ubNumQualifiedMercs != 0 )
+				{
+					//loop through all the mercs
+					for( ubCnt=0; ubCnt<ubNumQualifiedMercs; ubCnt++ )
+					{
+						pSoldier = MercPtrs[ ubQualifiedSoldierIDArray[ ubCnt ] ];
+
+						TacticalCharacterDialogue( pSoldier, QUOTE_JOINING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM );
+						pSoldier->usQuoteSaidExtFlags |= SOLDIER_QUOTE_SAID_EXT_MORRIS;
+					}
+				}
+
+				//Morris should say a new quote
+//				CharacterDialogue( MORRIS, QUOTE_ATTACKED_BY_MULTIPLE_CREATURES, gTalkPanel.iFaceIndex, DIALOGUE_NPC_UI, FALSE, FALSE );
+
+				TriggerNPCRecord( 75, 2 );
+
+				gfMorrisShouldSayHi = FALSE;
+			}
+		}
+
+
+		return;
+	}
+#else		//Ja25: no mike

 	if ( iQSize == 0 )
 	{
@@ -694,7 +806,7 @@ void HandleDialogue( )

 		return;
 	}
-
+#endif
 	// ATE: Remove any civ quotes....
 	// ShutDownQuoteBoxIfActive( TRUE );

@@ -807,7 +919,15 @@ void HandleDialogue( )
 		// Setup face pointer
 		gpCurrentTalkingFace = &gFacesData[ QItem->iFaceIndex ];
 		gubCurrentTalkingID	= QItem->ubCharacterNum;
-
+#ifdef JA2UB		
+		//Ja25: test
+		if( QItem->ubCharacterNum == 75 ) //MORRIS
+		{
+			if( QItem->usQuoteNum == 0 )
+			{
+			}
+		}
+#endif
 		ExecuteCharacterDialogue( QItem->ubCharacterNum, QItem->usQuoteNum, QItem->iFaceIndex, QItem->bUIHandlerID, QItem->fFromSoldier );

 	}
@@ -1123,6 +1243,32 @@ void HandleDialogue( )
 		{
 			SetUpdateBoxFlag( TRUE );
 		}
+#ifdef JA2UB
+		else if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_JERRY_MILO )
+		{
+			//switch on the quote that is being spoken
+			switch( QItem->uiSpecialEventData )
+			{				
+				case JM_SE__SHOW_RADIO_LOCATOR:
+					HandleShowingRadioLocatorsInMorrisArea();
+					break;
+
+				case JM_SE__HEADING_TO_TRACONA:
+
+					// play the heli crash video
+					SetIntroType( INTRO_HELI_CRASH );
+
+					//Go to the intro screen
+					RequestTriggerExitFromMapscreen( MAP_EXIT_TO_INTRO_SCREEN );
+					break;
+
+
+				default:
+					//nothing
+					break;
+			}
+		}
+#else //Ja25: removed the flag, no militia
 		else if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_CONTINUE_TRAINING_MILITIA )
 		{
 			// grab soldier ptr from profile ID
@@ -1134,6 +1280,7 @@ void HandleDialogue( )
 				HandleInterfaceMessageForContinuingTrainingMilitia( pSoldier );
 			}
 		}
+#endif
 		else if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_ENTER_MAPSCREEN )
 		{
 			if( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) )
@@ -1168,6 +1315,49 @@ void HandleDialogue( )
 		}
 		else if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_MULTIPURPOSE )
 		{
+#ifdef JA2UB
+			//JA25 UB
+			if ( QItem->uiSpecialEventData & MULTIPURPOSE_SPECIAL_EVENT_TEAM_MEMBERS_DONE_TALKING )
+			{
+				HandleEveryoneDoneTheirEndGameQuotes();
+			}
+			else
+			{
+				// grab soldier ptr from profile ID
+				pSoldier = FindSoldierByProfileID( (UINT8)QItem->uiSpecialEventData, FALSE );
+
+				// Now, wake these sluts up and have them say quote...
+				pSoldier->fIgnoreGetupFromCollapseCheck = FALSE;
+
+				//Get the soldier up
+				pSoldier->bCollapsed = FALSE;
+				pSoldier->ChangeSoldierStance( ANIM_STAND );
+
+				//if the soldier is Jerry
+				if( FindSoldierByProfileID( 76, FALSE ) == pSoldier ) //JERRY
+				{
+					//Play the sound of the Antena breaking
+					PlayJA2SampleFromFile( "SOUNDS\\Metal Antenna Crunch.wav", RATE_11025, HIGHVOLUME, 1, MIDDLE );
+				}
+
+				//Turn off the flag saying we are doing the initial heli crash
+				gfFirstTimeInGameHeliCrash = FALSE;
+
+				//if all the mercs are done their talk
+				if( AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes() )
+				{
+					//Trigger Jerry Milo's script record 10 ( call action 301 )
+					//AA 
+					//if ( gGameUBOptions.InGameHeliCrash == TRUE )
+					if ( gGameUBOptions.JerryQuotes == TRUE )
+					DelayedMercQuote( 76 , 0xffff, 4 ); //JERRY
+
+					//End the ui Lock
+					guiPendingOverrideEvent = LU_ENDUILOCK;
+				}
+			}
+		}
+#else //Ja25 No queen
 			if ( QItem->uiSpecialEventData & MULTIPURPOSE_SPECIAL_EVENT_DONE_KILLING_DEIDRANNA )
 			{
 				HandleDoneLastKilledQueenQuote( );
@@ -1177,6 +1367,7 @@ void HandleDialogue( )
 				HandleDoneLastEndGameQuote( );
 			}
 		}
+#endif
 		else if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_SLEEP )
 		{
 			// no soldier, leave now
@@ -1317,11 +1508,14 @@ BOOLEAN TacticalCharacterDialogue( SOLDIERTYPE *pSoldier, UINT16 usQuoteNum )
 		return( FALSE );
 	}

+#ifdef JA2UB
+//Ja25 no meanwhiles
+#else
 	if ( AreInMeanwhile( ) )
 	{
 		return( FALSE );
 	}
-
+#endif
 	if (pSoldier->stats.bLife < CONSCIOUSNESS )
 	return( FALSE );

@@ -1784,7 +1978,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
 	}
 	//else if ( ubCharacterNum >= FIRST_RPC && ubCharacterNum < GASTON &&
 	//new profiles by Jazz
-	else if ( ( gProfilesRPC[ubCharacterNum].ProfilId == ubCharacterNum || gProfilesNPC[ubCharacterNum].ProfilId == ubCharacterNum || gProfilesVehicle[ubCharacterNum].ProfilId == ubCharacterNum ) &&	
+	else if ( ( gProfilesRPC[ubCharacterNum].ProfilId == ubCharacterNum || gProfilesNPC[ubCharacterNum].ProfilId == ubCharacterNum ) && //|| gProfilesVehicle[ubCharacterNum].ProfilId == ubCharacterNum ) &&	
 			( !( gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED )
 			|| ProfileCurrentlyTalkingInDialoguePanel( ubCharacterNum )
 			|| (gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_FORCENPCQUOTE) )
@@ -1832,12 +2026,32 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
 				//new profiles by Jazz
 				if ( ( gProfilesRPC[ubCharacterNum].ProfilId == ubCharacterNum || gProfilesNPC[ubCharacterNum].ProfilId == ubCharacterNum || gProfilesVehicle[ubCharacterNum].ProfilId == ubCharacterNum ) && gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED )	
 				{
-					if ( gSoundProfileValue[ubCharacterNum].EnabledSound == TRUE )
-					{
-					sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
+//inshy: fix for UB-1.13 version only					sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
+				if ( gSoundProfileValue[ubCharacterNum].EnabledSound == TRUE )
+				{
+//#ifdef JA2UB
+					sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
 					if ( !FileExists( zFileName ) )
 					{
-						sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
+						sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
+					}					
+								
+//#else
+//					sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum );
+//#endif
+					if ( !FileExists( zFileName ) )
+					{
+//inshy: fix for UB-1.13 version only						sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
+//#ifdef JA2UB
+						sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
+						
+					if ( !FileExists( zFileName ) )
+					{
+						sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum );
+					}	
+//#else
+//						sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum );
+//#endif
 //<SB> Also check for Russian Gold sound files (identical to international ones)
 						if(! FileExists( zFileName ) )
 						{
@@ -2511,6 +2725,10 @@ void SayQuoteFromAnyBodyInSector( UINT16 usQuoteNum )
 		{
 			if ( gTacticalStatus.bNumFoughtInBattle[ ENEMY_TEAM ] == 0 )
 			{
+			
+#ifdef JA2UB
+//Ja25 No Ira, Miguel etc.
+#else
 				// quotes referring to Deidranna's men so we skip quote if there were no army guys fought
 				if ( (usQuoteNum == QUOTE_SECTOR_SAFE) && (pTeamSoldier->ubProfile == IRA || pTeamSoldier->ubProfile == MIGUEL || pTeamSoldier->ubProfile == SHANK ) )
 				{
@@ -2521,6 +2739,7 @@ void SayQuoteFromAnyBodyInSector( UINT16 usQuoteNum )
 				{
 					continue;
 				}
+#endif
 			}

 			ubMercsInSector[ ubNumMercs ] = (UINT8)cnt;
@@ -2720,6 +2939,21 @@ void TextOverlayClickCallback( MOUSE_REGION * pRegion, INT32 iReason )
 				ShutDownLastQuoteTacticalTextBox( );
 			}
 		}
+#ifdef JA2UB		
+		//JA25 UB
+		//if we are in the heli crash sequence
+		else if( gJa25SaveStruct.fJerryBreakingLaptopOccuring )
+		{
+			InitJerriesSpeechCallBack();
+		}
+
+		//else the Commander morris note is being displayed
+		else if( gJa25SaveStruct.ubDisplayCommanderMorrisNote != DMN__NOT_TO_DISPLAY_IT ||
+						 gJa25SaveStruct.ubDisplayCommanderMorrisNote != DMN__FINISHED )
+		{
+			HandlePlayerClosingMorrisNoteDisplayedOnScreen();
+		}
+#endif
 	}
 	else if (iReason & MSYS_CALLBACK_REASON_LOST_MOUSE )
 	{
@@ -2981,3 +3215,96 @@ void SetExternMapscreenSpeechPanelXY( INT16 sXPos, INT16 sYPos )
 	gsExternPanelXPosition	 = sXPos;
 	gsExternPanelYPosition	 = sYPos;
 }
+
+
+#ifdef JA2UB
+//JA25 UB
+BOOLEAN AreAllTheMercsFinishedSayingThereInitialHeliCrashQuotes()
+{
+	INT32                   cnt;
+	SOLDIERTYPE             *pSoldier;
+
+	// IF IT'S THE SELECTED GUY, MAKE ANOTHER SELECTED!
+	cnt = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
+
+	// look for all mercs on the same team, 
+	for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ OUR_TEAM ].bLastID; cnt++,pSoldier++)
+	{       
+		//if the merc is alive, in sector, etc...
+		if ( OK_CONTROLLABLE_MERC( pSoldier )  )
+		{
+			//if the merc is still not done the initial speech, and still prone
+			if( pSoldier->fIgnoreGetupFromCollapseCheck )
+			{
+				//we arent done
+				return( FALSE );
+			}
+		}
+	}
+
+	//See if Jerry is still waiting to get up
+	pSoldier = FindSoldierByProfileID( 76, FALSE );
+	if( pSoldier )
+	{
+		//if the merc is still not done the initial speech, and still prone
+		if( pSoldier->fIgnoreGetupFromCollapseCheck )
+		{
+			//we arent done
+			return( FALSE );
+		}
+	}
+
+	//all mercs on the team are done
+	return( TRUE );
+}
+
+void InitJerriesSpeechCallBack()
+{
+	//Trigger Jerry Milo's script record 10 ( call action 301 )
+	TriggerNPCRecord( 76, 10 );
+
+	//Clear the overlay
+	RemoveJerryMiloBrokenLaptopOverlay();
+}
+
+void RemoveJerryMiloBrokenLaptopOverlay()
+{
+	//if the overlay is up
+	if( gJa25SaveStruct.fJerryBreakingLaptopOccuring )
+	{
+		gJa25SaveStruct.fJerryBreakingLaptopOccuring = FALSE;
+
+		RemoveVideoOverlay( giTextBoxOverlay );
+		giTextBoxOverlay = -1;
+
+		if( fTextBoxMouseRegionCreated )
+		{
+			MSYS_RemoveRegion( &gTextBoxMouseRegion );
+			fTextBoxMouseRegionCreated = FALSE; 
+		}
+	}
+}
+
+void HandlePlayerClosingMorrisNoteDisplayedOnScreen()
+{
+	RemoveVideoOverlay( giTextBoxOverlay );
+	giTextBoxOverlay = -1;
+
+	if ( fTextBoxMouseRegionCreated )
+	{
+		MSYS_RemoveRegion( &gTextBoxMouseRegion );
+		fTextBoxMouseRegionCreated = FALSE; 
+	}
+
+	if( gJa25SaveStruct.ubDisplayCommanderMorrisNote == DMN__DISPLAY_PART_2 )
+	{
+		gJa25SaveStruct.ubDisplayCommanderMorrisNote = DMN__FINISHED;
+
+		HandleShowingRadioLocatorsInMorrisArea();
+	}
+	else
+	{
+		DelayedMercQuote( gJa25SaveStruct.bNewMercProfileIDForSayingMorrisNote, DQ__MORRIS_NOTE_DISPLAY_NOTE_1, GetWorldTotalSeconds() + 1 );
+	}
+}
+#endif