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
@@ -119,6 +119,13 @@
 #include "Luaglobal.h"
 #include "LuaInitNPCs.h"
 #include "Interface.h"
+#include "Vehicles.h"
+#ifdef JA2UB
+#include "Ja25 Strategic Ai.h"
+#include "Ja25_Tactical.h"
+#include "Soldier Control.h"
+#include "ub_config.h"
+#endif

 // OJW - 20090419
 UINT8	giMAXIMUM_NUMBER_OF_PLAYER_MERCS = CODE_MAXIMUM_NUMBER_OF_PLAYER_MERCS;
@@ -194,6 +201,13 @@ extern UINT16 PickSoldierReadyAnimation( SOLDIERTYPE *pSoldier, BOOLEAN fEndRead

 extern void PlayStealthySoldierFootstepSound( SOLDIERTYPE *pSoldier );

+#ifdef JA2UB
+BOOLEAN CanMsgBoxForPlayerToBeNotifiedOfSomeoneElseInSector();
+
+extern void PlayStealthySoldierFootstepSound( SOLDIERTYPE *pSoldier );
+//extern	BOOLEAN		gfFirstTimeInGameHeliCrash; //JA25 UB
+#endif
+
 extern BOOLEAN gfSurrendered;

 // GLOBALS
@@ -1087,7 +1101,46 @@ BOOLEAN ExecuteOverhead( )
 						*/
 					}
 				}
+#ifdef JA2UB				
+				//Ja25 UB
+				// ATE: JA25 additon - poll for getting up from start of game...
+				if( pSoldier->fWaitingToGetupFromJA25Start )
+				{
+					if( !DialogueActive( ) )
+					{
+						///if the timer is done, AND no one is talking
+						if( TIMECOUNTERDONE( pSoldier->GetupFromJA25StartCounter, 0 ) )
+						{
+							//make sure they wont say this again
+							pSoldier->fWaitingToGetupFromJA25Start = FALSE;

+							//
+							//Get the soldier that should say the quote
+							//
+
+							//if the merc is one of the mercs who has Quote 80, say that
+							if( pSoldier->ubProfile == 58 ||//GASTON
+									pSoldier->ubProfile == 59 ||//STOGIE
+									pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__PLAYER_CHARACTER )
+							{
+								TacticalCharacterDialogue( pSoldier, QUOTE_REPUTATION_REFUSAL );
+							}
+							else
+							{
+								// Now make them say their curse sound
+								pSoldier->DoMercBattleSound( BATTLE_SOUND_CURSE1 );
+							}
+
+							SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_MULTIPURPOSE, pSoldier->ubProfile, 0, 0, pSoldier->iFaceIndex, 0 );
+						}
+					}
+					else
+					{
+						pSoldier->GetupFromJA25StartCounter += giTimerDiag;
+					}
+				}				
+				
+#endif
 				// Checkout fading
 				if ( pSoldier->flags.fBeginFade )
 				{
@@ -1333,6 +1386,21 @@ BOOLEAN ExecuteOverhead( )
 									// Cancel reverse
 									pSoldier->bReverse = FALSE;

+									BOOLEAN fAimAfterMove = FALSE;
+									if ( pSoldier->usAnimState == SIDE_STEP_PISTOL_RDY || pSoldier->usAnimState == SIDE_STEP_RIFLE_RDY || 
+										pSoldier->usAnimState == WALKING_PISTOL_RDY || pSoldier->usAnimState == WALKING_RIFLE_RDY )
+									{
+										fAimAfterMove = TRUE;
+										pSoldier->usPendingAnimation = AIM_RIFLE_STAND;
+										pSoldier->ubPendingDirection = pSoldier->ubDirection;
+									}
+									else if ( pSoldier->usAnimState == SIDE_STEP_DUAL_RDY || pSoldier->usAnimState == WALKING_DUAL_RDY )
+									{
+										fAimAfterMove = TRUE;
+										pSoldier->usPendingAnimation = AIM_DUAL_STAND;
+										pSoldier->ubPendingDirection = pSoldier->ubDirection;
+									}
+
 									// OK, if we are the selected soldier, refresh some UI stuff
 									if ( pSoldier->ubID == (UINT8)gusSelectedSoldier )
 									{
@@ -1591,7 +1659,10 @@ BOOLEAN ExecuteOverhead( )
 											{
 												UnSetUIBusy( pSoldier->ubID );

-												pSoldier->SoldierGotoStationaryStance( );
+												if ( !fAimAfterMove ) // SANDRO - don't do this after movement with weapon raised
+												{
+													pSoldier->SoldierGotoStationaryStance( );
+												}
 											}
 										}
 									}
@@ -1740,7 +1811,10 @@ BOOLEAN ExecuteOverhead( )
 								dAngle = gdRadiansForAngle[ pSoldier->bMovementDirection ];

 								// For walking, base it on body type!
-								if ( pSoldier->usAnimState == WALKING )
+								if ( pSoldier->usAnimState == WALKING || 
+									 pSoldier->usAnimState == WALKING_PISTOL_RDY ||
+									 pSoldier->usAnimState == WALKING_RIFLE_RDY ||
+									 pSoldier->usAnimState == WALKING_DUAL_RDY )
 								{
 									pSoldier->MoveMerc( gubAnimWalkSpeeds[ pSoldier->ubBodyType ].dMovementChange, dAngle, TRUE );

@@ -1814,6 +1888,37 @@ BOOLEAN ExecuteOverhead( )
 			}
 		}

+		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// SANDRO - hack! - resolve possible pending interrupt
+		if(GetSoldier(&pSoldier, gusSelectedSoldier) && gGameExternalOptions.fImprovedInterruptSystem )
+		{
+			if ( pSoldier->bActive )
+			{
+				if ( ResolvePendingInterrupt( pSoldier, UNDEFINED_INTERRUPT ) )
+				{
+					fKeepMoving = FALSE;
+					pSoldier->AdjustNoAPToFinishMove( TRUE );
+					pSoldier->usPendingAnimation = NO_PENDING_ANIMATION;
+					pSoldier->ubPendingDirection = NO_PENDING_DIRECTION;
+
+					// "artificially" set lock ui flag in this case
+					if (pSoldier->bTeam == gbPlayerNum)
+					{
+						AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, Message[STR_INTERRUPT] );
+						guiPendingOverrideEvent = LU_BEGINUILOCK;	
+						HandleTacticalUI( );
+					}
+
+					// return early
+					gubNPCAPBudget = 0;
+					gubNPCDistLimit = 0;
+
+					return( TRUE );
+				}
+			}
+		}
+		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 		// Turn off auto bandage if we need to...
 		if ( gTacticalStatus.fAutoBandageMode )
 		{
@@ -2442,8 +2547,8 @@ BOOLEAN HandleGotoNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving, BOOLE
 			}
 			else
 			{
-				// Adjust AP/Breathing points to move
-				DeductPoints( pSoldier, sAPCost, sBPCost );
+				// Adjust AP/Breathing points to move				
+				DeductPoints( pSoldier, sAPCost, sBPCost, MOVEMENT_INTERRUPT );
 			}

 			// OK, let's check for monsters....
@@ -2702,7 +2807,7 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )

 	// Set "interrupt occurred" flag to false so that we will know whether *this
 	// particular call* to HandleSight caused an interrupt
-	gTacticalStatus.fInterruptOccurred = FALSE;
+	gTacticalStatus.fInterruptOccurred = FALSE;	

 	if ( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) )
 	{
@@ -2724,6 +2829,17 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
 		HandleSight(pSoldier,SIGHT_LOOK | SIGHT_RADIO | SIGHT_INTERRUPT);
 	}

+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// SANDRO - if pending interrupt flag was set for movement type of interupt, resolve it here
+	if ( gGameExternalOptions.fImprovedInterruptSystem )
+	{
+		if ( ResolvePendingInterrupt( pSoldier, MOVEMENT_INTERRUPT ) )
+		{
+			AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, Message[STR_INTERRUPT] );		
+		}
+	}
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	
 	// ATE: Check if we have sighted anyone, if so, don't do anything else...
 	// IN other words, we have stopped from sighting...
 	if (gTacticalStatus.fInterruptOccurred)
@@ -2860,7 +2976,7 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
 						pSoldier->EVENT_StopMerc( pSoldier->sGridNo, pSoldier->ubDirection );
 						SetFactTrue( FACT_SKYRIDER_CLOSE_TO_CHOPPER );
 						TriggerNPCRecord( SKYRIDER, 15 );
-						SetUpHelicopterForPlayer( 13, MAP_ROW_B, SKYRIDER );
+						SetUpHelicopterForPlayer( 13, MAP_ROW_B, gNewVehicle[ HELICOPTER ].NewPilot, HELICOPTER );
 					}
 					break;

@@ -3368,6 +3484,9 @@ void HandlePlayerTeamMemberDeath( SOLDIERTYPE *pSoldier )
 		// handle stuff for Carmen if Slay is killed
 		switch( pSoldier->ubProfile )
 		{
+#ifdef JA2UB
+//Ja25 No carmen
+#else
 		case SLAY:
 			pTeamSoldier = FindSoldierByProfileID( CARMEN, FALSE );			
 			if (pTeamSoldier && pTeamSoldier->aiData.bAttitude == ATTACKSLAYONLY && !TileIsOutOfBounds(ClosestPC( pTeamSoldier, NULL )) )
@@ -3376,6 +3495,7 @@ void HandlePlayerTeamMemberDeath( SOLDIERTYPE *pSoldier )
 				TriggerNPCRecord( CARMEN, 29 );
 			}
 			break;
+#endif
 		case ROBOT:
 			if (CheckFact( FACT_FIRST_ROBOT_DESTROYED, 0 ) == FALSE )
 			{
@@ -3450,8 +3570,10 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )

 	if (pSoldierOld->bTeam == CIV_TEAM )
 	{
+		#ifdef JA2UB
+		#else
 		SOLDIERTYPE * pOther;
-
+		#endif
 		// ATE: Added string to player
 		if ( bVisible != -1 && pSoldierOld->ubProfile != NO_PROFILE )
 		{
@@ -3460,6 +3582,24 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )

 		switch( pSoldierOld->ubProfile )
 		{
+#ifdef JA2UB
+			case 75: //MORRIS
+				{
+					INT8 bSoldierID;
+
+					//Geta a random soldier ID
+					bSoldierID = RandomSoldierIdFromNewMercsOnPlayerTeam();
+
+					//if there is any
+					if( bSoldierID != -1 )
+					{
+						//say the MORRIS dead quote
+						TacticalCharacterDialogue( &Menptr[ bSoldierID ], QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW );
+					}					
+				}
+				break;
+
+#else //Ja25: none of these characters are in the exp.
 		case BRENDA:
 			SetFactTrue( FACT_BRENDA_DEAD );
 			{
@@ -3598,13 +3738,22 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 				HandleNPCDoAction( DOREEN, NPC_ACTION_FREE_KIDS, 0 );
 			}
 			break;
-		// SANDRO - Check if queen bitch is dead 
+	#endif
+
+#ifdef JA2UB
+
+#else
+			// SANDRO - Check if queen bitch is dead 
 		case QUEEN:
 			// Muhahahahaaa, QUEST COMPLETED! Give us everything!! Exp, glory, fame!
 			EndQuest( QUEST_KILL_DEIDRANNA, pSoldierOld->sSectorX, pSoldierOld->sSectorY );
-			break;
+		break;
+#endif
+			
 		}
-
+#ifdef JA2UB
+// Ja25no queen
+#else
 		// Are we looking at the queen?
 		if ( pSoldierOld->ubProfile == QUEEN )
 		{
@@ -3615,7 +3764,7 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )

 			BeginHandleDeidrannaDeath( pKiller, pSoldierOld->sGridNo, pSoldierOld->pathing.bLevel );
 		}
-
+#endif
 		// crows/cows are on the civilian team, but none of the following applies to them
 		if ( ( pSoldierOld->ubBodyType != CROW ) && ( pSoldierOld->ubBodyType != COW ) )
 		{
@@ -3663,6 +3812,10 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 	}
 	else	// enemies and creatures... should any of this stuff not be called if a creature dies?
 	{
+	
+#ifdef JA2UB
+//no queen, or queen monster
+#else
 		if ( pSoldierOld->ubBodyType == QUEENMONSTER )
 		{
 			SOLDIERTYPE *pKiller = NULL;
@@ -3674,7 +3827,7 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 				BeginHandleQueenBitchDeath( pKiller, pSoldierOld->sGridNo, pSoldierOld->pathing.bLevel );
 			}
 		}
-
+#endif
 		if ( pSoldierOld->bTeam == ENEMY_TEAM )
 		{
 			gTacticalStatus.ubArmyGuysKilled++;
@@ -3695,7 +3848,9 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 			// reset the chosen one!
 			gTacticalStatus.ubTheChosenOne = NOBODY;
 		}
-
+#ifdef JA2UB
+//no queen, or queen monster
+#else
 		if ( pSoldierOld->ubProfile == QUEEN )
 		{
 			HandleMoraleEvent( NULL, MORALE_DEIDRANNA_KILLED, gWorldSectorX, gWorldSectorY, gbWorldSectorZ	);
@@ -3710,6 +3865,7 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 			HandleNPCDoAction( 0, NPC_ACTION_GRANT_EXPERIENCE_5, 0 );

 		}
+#endif
 	}


@@ -3778,10 +3934,39 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )

 	//if the NPC is a dealer, add the dealers items to the ground
 	AddDeadArmsDealerItemsToWorld( pSoldierOld->ubProfile );
+	
+#ifdef JA2UB
+	HandleDeathInPowerGenSector( pSoldierOld ); //ja25 ub
+	HandleWhenCertainPercentageOfEnemiesDie();  //ja25 ub
+#endif

 	//The queen AI layer must process the event by subtracting forces, etc.
 	ProcessQueenCmdImplicationsOfDeath( pSoldierOld );
+#ifdef JA2UB
+	 //------------------- ja25 ub -------------------------
+	//if the person was Raul, and we are to say the blown up quotes
+	if( pSoldierOld->ubProfile == PERKO /*RAUL */ && IsJa25GeneralFlagSet( JA_GF__RAUL_BLOW_HIMSELF_UP ) )
+	{
+		UINT8 SoldierId1;
+		UINT8 SoldierId2;

+		//Get some random Soldier ID's of the valid mercs
+		if( Get3RandomQualifiedMercs( &SoldierId1, &SoldierId2, NULL ) != 0 )
+		{		
+			//Say the "he blew himself up quote"
+			TacticalCharacterDialogue( &Menptr[SoldierId1], QUOTE_GREETING );
+
+			//if there isnt a second soldier
+			if( SoldierId2 == NOBODY )
+			{
+				SoldierId2 = SoldierId1;
+			}
+
+			//say the "darn he took the inventoruy with him"
+			TacticalCharacterDialogue( &Menptr[SoldierId2], QUOTE_SMALL_TALK );
+		}
+	}
+#endif
 	// OK, check for existence of any more badguys!
 	CheckForEndOfBattle( FALSE );
 }
@@ -3905,10 +4090,14 @@ void MakeCivHostile( SOLDIERTYPE *pSoldier, INT8 bNewSide )

 	switch( pSoldier->ubProfile )
 	{
+#ifdef JA2UB
+//Ja25 No Ira, miguel, etc
+#else
 	case IRA:
 	case DIMITRI:
 	case MIGUEL:
 	case CARLOS:
+#endif	
 	case MADLAB:
 	case DYNAMO:
 	case SHANK:
@@ -3989,6 +4178,16 @@ void MakeCivHostile( SOLDIERTYPE *pSoldier, INT8 bNewSide )
 	{
 		CheckForPotentialAddToBattleIncrement( pSoldier );
 	}
+	
+
+		//uses Lua
+		PROFILLUA2_ubProfile = pSoldier->ubProfile;
+		PROFILLUA2_sSectorX = pSoldier->sSectorX;
+		PROFILLUA2_sSectorY = pSoldier->sSectorY;
+		PROFILLUA2_bSectorZ = pSoldier->bSectorZ;
+		PROFILLUA2_sGridNo = pSoldier->sGridNo;
+	
+	//LetLuaMyCustomHandleAtNewGridNo(bNewSide,NULL, 1);	
 }

 UINT8 CivilianGroupMembersChangeSidesWithinProximity( SOLDIERTYPE * pAttacked )
@@ -5703,6 +5902,7 @@ void CommonEnterCombatModeCode( )
 	gTacticalStatus.fLastBattleWon		= FALSE;
 	gTacticalStatus.fItemsSeenOnAttack	= FALSE;

+	gTacticalStatus.ubInterruptPending	= DISABLED_INTERRUPT;

 	// ATE: If we have an item pointer end it!
 	CancelItemPointer( );
@@ -5748,6 +5948,9 @@ void CommonEnterCombatModeCode( )
 				// carryover for this battle.	So we'll hit it again.
 				pSoldier->CalcNewActionPoints( );

+				// SANDRO - Improved Interrupt System - reset interrupt counter
+				memset(pSoldier->aiData.ubInterruptCounter,0,sizeof(pSoldier->aiData.ubInterruptCounter));
+
 				if ( pSoldier->ubProfile != NO_PROFILE )
 				{
 					if ( pSoldier->bTeam == CIV_TEAM && pSoldier->aiData.bNeutral )
@@ -5971,6 +6174,11 @@ void ExitCombatMode( )
 	// since this would be the same as what would happen at the end of the turn
 	gTacticalStatus.uiTimeSinceLastOpplistDecay = __max( 0, GetWorldTotalSeconds() - TIME_BETWEEN_RT_OPPLIST_DECAYS );
 	NonCombatDecayPublicOpplist( GetWorldTotalSeconds() );
+	
+#ifdef JA2UB	
+	//if we are in J13 and the fan is stopped, handle it
+	HandleFanStartingAtEndOfCombat();
+#endif
 }


@@ -5989,7 +6197,14 @@ void SetEnemyPresence( )
 		// Change music modes..

 		// If we are just starting game, don't do this!
+	
+#ifdef JA2UB	
+		//Ja25: no meanwhiles
+		if ( !DidGameJustStart() )
+#else
 		if ( !DidGameJustStart() && !AreInMeanwhile( ) )
+
+#endif
 		{
 			SetMusicMode( MUSIC_TACTICAL_ENEMYPRESENT );
 			DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("SetEnemyPresence: warnings = false"));
@@ -6512,7 +6727,11 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
 			SetFactTrue( FACT_FIRST_BATTLE_FOUGHT );
 			SetFactFalse( FACT_FIRST_BATTLE_BEING_FOUGHT );
 			SetTheFirstBattleSector( (INT16) (gWorldSectorX + gWorldSectorY * MAP_WORLD_X) );
+#ifdef JA2UB
+//Ja25  no meanwhile
+#else
 			HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
+#endif
 		}

 		if( NumEnemyInSectorExceptCreatures() )
@@ -6766,7 +6985,11 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
 				SetFactTrue( FACT_FIRST_BATTLE_WON );
 				SetFactFalse( FACT_FIRST_BATTLE_BEING_FOUGHT );
 				SetTheFirstBattleSector( (INT16) (gWorldSectorX + gWorldSectorY * MAP_WORLD_X) );
+#ifdef JA2UB
+//Ja25  no meanwhile
+#else
 				HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
+#endif
 			}
 		}

@@ -7932,6 +8155,10 @@ BOOLEAN ProcessImplicationsOfPCAttack( SOLDIERTYPE * pSoldier, SOLDIERTYPE ** pp
 	}
 	else
 	{
+	
+#ifdef JA2UB
+//Ja25: No carmen
+#else
 		if (pTarget->ubProfile == CARMEN)// Carmen
 		{
 			// Special stuff for Carmen the bounty hunter
@@ -7941,7 +8168,7 @@ BOOLEAN ProcessImplicationsOfPCAttack( SOLDIERTYPE * pSoldier, SOLDIERTYPE ** pp
 				pTarget->aiData.bAttitude = AGGRESSIVE;
 			}
 		}
-
+#endif
 		if ( pTarget->ubCivilianGroup && ( (pTarget->bTeam == gbPlayerNum) || pTarget->aiData.bNeutral ) )
 		{
 #ifdef JA2TESTVERSION
@@ -8184,7 +8411,9 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
 			return( NULL );
 		}
 	}
-
+#ifdef JA2UB
+//Ja25 no queen
+#else
 	// ATE: IN MEANWHILES, we have 'combat' in realtime....
 	// this is so we DON'T call freeupattacker() which will cancel
 	// the AI guy's meanwhile NPC stuff.
@@ -8193,7 +8422,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
 	{
 		return( NULL );
 	}
-
+#endif
 #if 0
 // 0verhaul:	This is moved to the end loop where everybody's state is reset for the next action
 	if (pTarget)
@@ -8334,7 +8563,11 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
 			// Go into combat!

 			// If we are in a meanwhile... don't enter combat here...
+#ifdef JA2UB
+//Ja25 no meanwhiles
+#else
 			if ( !AreInMeanwhile( ) )
+#endif
 			{
 				EnterCombatMode( pSoldier->bTeam );
 			}
@@ -8427,6 +8660,25 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
 		pSoldier->sLastTarget = pSoldier->sTargetGridNo;
 	}

+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// SANDRO - if pending interrupt flag was set for after-shot type of interupt, try to resolve it now
+	if ( gGameExternalOptions.fImprovedInterruptSystem )
+	{
+		if ( ResolvePendingInterrupt( pSoldier, AFTERSHOT_INTERRUPT ) )
+		{
+			pSoldier->usPendingAnimation = NO_PENDING_ANIMATION;
+			pSoldier->ubPendingDirection = NO_PENDING_DIRECTION;
+			// "artificially" set lock ui flag
+			if (pSoldier->bTeam == gbPlayerNum)
+			{
+				AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, Message[STR_INTERRUPT] );
+				guiPendingOverrideEvent = LU_BEGINUILOCK;			
+				HandleTacticalUI( );
+			}
+		}
+	}
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 	// Reset various flags and values that should be 0 once the action is overwith
 	for (cnt = 0; cnt < guiNumMercSlots; cnt++)
 	{
@@ -9199,3 +9451,105 @@ INT8 CheckStatusNearbyFriendlies( SOLDIERTYPE *pSoldier )
 	return(sModifier);

 }
+
+
+#ifdef JA2UB
+void SetMsgBoxForPlayerBeNotifiedOfSomeoneElseInSector()
+{
+	//if the player in the same sector as MANUEL
+	if( !CanMsgBoxForPlayerToBeNotifiedOfSomeoneElseInSector() )
+	{
+		return;
+	}
+
+	gJa25SaveStruct.fShouldMsgBoxComeUpSayingSomeoneImportantIsInSector = TRUE;
+}
+
+void HandleThePlayerBeNotifiedOfSomeoneElseInSector()
+{
+	//if we shouldnt be here, get out
+	if( !gJa25SaveStruct.fShouldMsgBoxComeUpSayingSomeoneImportantIsInSector )
+	{
+		return;
+	}
+
+	//if somehting else is going on, leave
+	if( gTacticalStatus.fAutoBandageMode ||
+			DialogueActive( ) ||
+			gTacticalStatus.fAutoBandagePending ||
+			guiPendingScreen == MSG_BOX_SCREEN ||
+			guiCurrentScreen == MSG_BOX_SCREEN ||
+			AreWeInAUIMenu( )
+		)
+	{
+		return;
+	}
+
+	gJa25SaveStruct.fShouldMsgBoxComeUpSayingSomeoneImportantIsInSector = FALSE;
+
+	//if the player in the same sector as MANUEL
+	if( !CanMsgBoxForPlayerToBeNotifiedOfSomeoneElseInSector() )
+	{
+		return;
+	}
+
+	DoMessageBox( MSG_BOX_BASIC_STYLE, zNewTacticalMessages[ TACT_MSG__SOMEONE_ELSE_IN_SECTOR ], GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_OK, NULL, NULL );
+
+}
+
+BOOLEAN CanMsgBoxForPlayerToBeNotifiedOfSomeoneElseInSector()
+{
+	// ATE: if this is a custom map, return
+/*	if ( gbWorldSectorZ == 0 )
+	{
+		if ( SectorInfo[ SECTOR( gWorldSectorY, gWorldSectorX ) ].fCustomSector )
+		{
+			return( FALSE );
+		}
+	}
+*/
+	if( ( gWorldSectorX == gMercProfiles[ 60 ].sSectorX && gWorldSectorY == gMercProfiles[ 60 ].sSectorY && gbWorldSectorZ == gMercProfiles[ 60 ].bSectorZ ) )
+	{
+		//IF MANUEL is already hired
+		if( gMercProfiles[ 60 ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED )
+		{
+			//then we shouldnt display the message
+			return( FALSE );
+		}
+
+		return( TRUE );
+	}
+
+	return( FALSE );
+}
+
+
+INT8 NumMercsOnPlayerTeam( )
+{
+	INT32					cnt;
+	SOLDIERTYPE   *pSoldier;
+	UINT8         ubCount = 0;
+
+	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( pSoldier->bActive && pSoldier->stats.bLife > 0 )
+		{
+			ubCount++;
+		}
+	}
+
+	return( ubCount );
+}
+
+void HandleDisplayingOfPlayerLostDialogue( void )
+{
+	//if the laptop transmitter is broken, and the player doesnt have any other team members
+	if( gubQuest[ QUEST_FIX_LAPTOP ] != QUESTDONE &&  NumMercsOnPlayerTeam( ) == 0 && gGameUBOptions.LaptopQuestEnabled == TRUE )
+	{
+		gJa25SaveStruct.ubDisplayPlayerLostMsgBox	= 1;	
+	}
+}
+#endif