Merged from revision: 7065

Fixes (by Buggler)
- Added ALL_MEANWHILE_CUTSCENE to Mod_Settings.ini to enable/disable meanwhile cutscenes
- Changed LMB behavior to open description box of item-under-mouse for valid attachment in cursor in strategic screen; hold ALT hotkey to swap valid attachment items instead (due to item under mouse will auto-move to higher priority pockets if valid attachment in cursor cannot be swapped in)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7066 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -2701,7 +2701,7 @@ void LoadModSettings(){
 	gModSettings.ubMeanwhileAddMadlabSector4X = iniReader.ReadInteger("Meanwhile", "ADD_MADLAB_SECTOR_4_X", 4);
 	gModSettings.ubMeanwhileAddMadlabSector4Y = iniReader.ReadInteger("Meanwhile", "ADD_MADLAB_SECTOR_4_Y", 5);
 
-	
+	gModSettings.AllMeanwhileCutscene = iniReader.ReadBoolean("Meanwhile", "ALL_MEANWHILE_CUTSCENE", TRUE);
 	gModSettings.CreatureMeanwhileCutscene = iniReader.ReadBoolean("Meanwhile", "CREATURE_MEANWHILE_CUTSCENE", TRUE);
 	
 	//[End Game]

GameSettings.h

@@ -2146,6 +2146,8 @@ typedef struct
 	UINT8 ubEndGameVictorySectorY;
 	INT32 iEndGameVictoryGridNo;
 	
+	//enable meanwhile cutscene
+	BOOLEAN AllMeanwhileCutscene;
 	BOOLEAN CreatureMeanwhileCutscene;
 
 }MOD_SETTINGS;

Strategic/Meanwhile.cpp

@@ -336,7 +336,14 @@ void ScheduleMeanwhileEvent( MEANWHILE_DEFINITION *pMeanwhileDef, UINT32 uiTime
 	gMercProfiles[ ELLIOT ].bNPCData++;
 	}
 
-	AddStrategicEvent( EVENT_MEANWHILE, uiTime, pMeanwhileDef->ubMeanwhileID );
+	// enable/disable meanwhile cutscene
+	if( gModSettings.AllMeanwhileCutscene )
+		AddStrategicEvent( EVENT_MEANWHILE, uiTime, pMeanwhileDef->ubMeanwhileID );
+	else
+	{// simulate that we saw cutscene and handle implications right away
+		memcpy( &gCurrentMeanwhileDef, &(gMeanwhileDef[pMeanwhileDef->ubMeanwhileID]), sizeof( MEANWHILE_DEFINITION ) );
+		ProcessImplicationsOfMeanwhile();
+	}
 }
 
 

Strategic/mapscreen.cpp

@@ -9556,33 +9556,35 @@ void MAPInvClickCallback( MOUSE_REGION *pRegion, INT32 iReason )
 				return;
 			}
 
-			// !!! ATTACHING/MERGING ITEMS IN MAP SCREEN IS NOT SUPPORTED !!!
+			// hold ALT key to swap valid attachment item instead
+			if ( _KeyDown(ALT) )
+			{
+				// do nothing
+			}
+			else if ( ValidAttachment( usNewItemIndex, usOldItemIndex ) )
+			{
+				// it's an attempt to attach; bring up the inventory panel
+				if ( !InItemDescriptionBox( ) )
+				{
+					// HEADROCK HAM 5: Sector Inventory Item Desc Box no longer accessible during combat.
+					
+					if( gTacticalStatus.uiFlags & INCOMBAT )
+					{
+						DoScreenIndependantMessageBox( New113HAMMessage[ 23 ], MSG_BOX_FLAG_OK, NULL );
+						return;
+					}
+					else
+					{
+						MAPInternalInitItemDescriptionBox( &(pSoldier->inv[ uiHandPos ]), 0, pSoldier );
+					}
+				}
+				return;
+			}
+
+			// !!! MERGING ITEMS IN MAP SCREEN IS NOT SUPPORTED !!!
 			if ( uiHandPos == HANDPOS || uiHandPos == SECONDHANDPOS || uiHandPos == HELMETPOS || uiHandPos == VESTPOS || uiHandPos == LEGPOS )
 			{
-				if((UsingNewInventorySystem() == true) && !(pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE))
+				if ( ValidMerge( usNewItemIndex, usOldItemIndex ) )
-				{
-				}
-				//if ( ValidAttachmentClass( usNewItemIndex, usOldItemIndex ) )
-				else if ( ValidAttachment( usNewItemIndex, usOldItemIndex ) )
-				{
-					// it's an attempt to attach; bring up the inventory panel
-					if ( !InItemDescriptionBox( ) )
-					{
-						// HEADROCK HAM 5: Sector Inventory Item Desc Box no longer accessible during combat.
-						
-						if( gTacticalStatus.uiFlags & INCOMBAT )
-						{
-							DoScreenIndependantMessageBox( New113HAMMessage[ 23 ], MSG_BOX_FLAG_OK, NULL );
-							return;
-						}
-						else
-						{
-							MAPInternalInitItemDescriptionBox( &(pSoldier->inv[ uiHandPos ]), 0, pSoldier );
-						}
-					}
-					return;
-				}
-				else if ( ValidMerge( usNewItemIndex, usOldItemIndex ) )
 				{
 					// bring up merge requestor
 					// TOO PAINFUL TO DO!! --CC