*********************************************************

*	2006/05/01					*
*	Little Alien					*
*	Developed in VS 2003				*
*********************************************************

Source:
- Added militia control in tactical (can be turned on/off in ja2.ini file)
- Aiming/readying gun: show in red points needed for readying gun

Data:
- Added new ja2.ini



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

Strategic/Map Screen Interface.cpp

@@ -290,6 +290,8 @@ BOOLEAN fShowAttributeMenu = FALSE;
 BOOLEAN fShowSquadMenu = FALSE;
 BOOLEAN fShowContractMenu = FALSE;
 BOOLEAN fShowRemoveMenu =  FALSE;
+BOOLEAN fShowMilitiaControlMenu =  FALSE; //lal
+//BOOLEAN fShowTalkToAllMenu =  FALSE;//lal
 
 BOOLEAN fRebuildMoveBox = FALSE;
 
@@ -306,8 +308,17 @@ SGPPoint VehiclePosition={160,150};
 SGPPoint RepairPosition={160,150};
 SGPRect RepairDimensions={0,0,80,80};
 
-SGPRect AssignmentDimensions = { 0,0, 100, 95};
+//lal
+SGPPoint MilitiaControlPosition={120,150}; 
+SGPRect MilitiaControlDimensions={0,0,100,95};
+
+//SGPPoint TalkToAllPosition={160,150};
+//SGPRect TalkToAllDimensions={0,0,100,95};
+//lal
+
 SGPPoint AssignmentPosition = { 120, 150 };
+SGPRect AssignmentDimensions = { 0,0, 100, 95};
+
 SGPPoint SquadPosition ={ 160, 150 };
 SGPRect SquadDimensions ={ 0, 0, 140, 60 };
 
@@ -317,6 +328,8 @@ SGPPoint OrigSquadPosition ={ 160, 150 };
 SGPPoint OrigAssignmentPosition = { 120, 150 };
 SGPPoint OrigTrainPosition={160,150};
 SGPPoint OrigVehiclePosition={160,150};
+SGPPoint OrigMilitiaControlPosition = { 120, 150 }; //lal
+//SGPPoint OrigTalkToAllPosition = { 160, 150 };
 
 //extern BOOLEAN fMapExitDueToMessageBox;
 
@@ -2205,6 +2218,65 @@ void UpdateMapScreenAssignmentPositions( void )
 }
 
 
+//lal
+void UpdateMapScreenMilitiaControlPositions( void )
+{
+	// set the position of the pop up boxes
+	SGPPoint pPoint;
+
+	if( guiCurrentScreen != MAP_SCREEN )
+	{
+		return;
+	}
+
+	if( bSelectedAssignChar == -1 )
+	{
+		if( gfPreBattleInterfaceActive == FALSE )
+		{
+			giBoxY = 0;
+		}
+		return;
+	}
+
+	if( gCharactersList[ bSelectedAssignChar ].fValid == FALSE )
+	{
+		if( gfPreBattleInterfaceActive == FALSE )
+		{
+			giBoxY = 0;
+		}
+		return;
+	}
+
+	if( gfPreBattleInterfaceActive )
+	{
+		// do nothing
+	}
+	else
+	{
+		giBoxY = ( Y_START + ( bSelectedAssignChar ) * ( Y_SIZE + 2 ) );
+	}
+		
+	MilitiaControlPosition.iY = giBoxY;
+
+	//TalkToAllPosition.iY = MilitiaControlPosition.iY + ( GetFontHeight( MAP_SCREEN_FONT ) + 2 )* MILCON_MENU_ALL;
+
+
+
+	if( fShowMilitiaControlMenu )
+	{
+		GetBoxPosition( ghMilitiaControlBox, &pPoint);
+		pPoint.iY = giBoxY;
+
+		SetBoxPosition( ghMilitiaControlBox, pPoint );
+	}
+
+	return;
+}
+//lal
+
+
+
+
 
 void RandomMercInGroupSaysQuote( GROUP *pGroup, UINT16 usQuoteNum )
 {

Strategic/Map Screen Interface.h

@@ -52,6 +52,35 @@ typedef struct FASTHELPREGION {
 #define			MAP_START_KEYRING_Y   107
 #define     Y_SIZE                GetFontHeight(MAP_SCREEN_FONT)
 
+//lal
+// militia control menu
+enum{
+	MILCON_MENU_ATTACK,
+	MILCON_MENU_HOLD,
+	MILCON_MENU_RETREAT,
+	MILCON_MENU_COMETOME,
+	MILCON_MENU_GETDOWN,
+	MILCON_MENU_TAKE_COVER,
+	MILCON_MENU_ALL_ATTACK,
+	MILCON_MENU_ALL_HOLD,
+	MILCON_MENU_ALL_RETREAT,
+	MILCON_MENU_ALL_COMETOME,
+	MILCON_MENU_ALL_GETDOWN,
+	MILCON_MENU_ALL_TAKE_COVER,
+	MILCON_MENU_ALL_TAKE_ITEMS,
+	MILCON_MENU_CANCEL,
+	MAX_MILCON_STRING_COUNT,
+};
+
+//enum{
+//	TTALL_MENU_ATTACK,
+//	TTALL_MENU_HOLD,
+//	TTALL_MENU_RETREAT,
+//	TTALL_MENU_COMETOME,
+//	TTALL_MENU_GETDOWN,
+//	TTALL_MENU_CANCEL,
+//	MAX_TTALL_STRING_COUNT,
+//};
 
 // attribute menu defines (must match NUM_TRAINABLE_STATS defines, and pAttributeMenuStrings )
 enum {
@@ -212,6 +241,8 @@ extern BOOLEAN fShowAttributeMenu;
 extern BOOLEAN fShowSquadMenu ;
 extern BOOLEAN fShowContractMenu ;
 extern BOOLEAN fShowRemoveMenu ;
+extern BOOLEAN fShowMilitiaControlMenu ; //lal
+//extern BOOLEAN fShowTalkToAllMenu ;
 
 extern BOOLEAN fFirstTimeInMapScreen;
 extern BOOLEAN fLockOutMapScreenInterface;
@@ -261,12 +292,20 @@ extern SGPRect SquadDimensions ;
 extern SGPPoint RepairPosition;
 extern SGPRect RepairDimensions;
 
+extern SGPPoint MilitiaControlPosition; //lal
+extern SGPRect MilitiaControlDimensions;
+
+//extern SGPPoint TalkToAllPosition;
+//extern SGPRect TalkToAllDimensions;
+
 extern SGPPoint OrigContractPosition;
 extern SGPPoint OrigAttributePosition;
 extern SGPPoint OrigSquadPosition ;
 extern SGPPoint OrigAssignmentPosition ;
 extern SGPPoint OrigTrainPosition;
 extern SGPPoint OrigVehiclePosition;
+extern SGPPoint OrigMilitiaControlPosition ; //lal
+//extern SGPPoint OrigTalkToAllPosition ;
 
 // disble team info panel due to showing of battle roster
 extern BOOLEAN fDisableDueToBattleRoster;
@@ -433,6 +472,7 @@ void RenderMapRegionBackground( void );
 
 // update mapscreen assignment positions
 void UpdateMapScreenAssignmentPositions( void );
+void UpdateMapScreenMilitiaControlPositions( void );
 
 // get the umber of valid mercs in the mapscreen character list
 INT32 GetNumberOfPeopleInCharacterList( void );

Strategic/mapscreen.cpp

@@ -862,6 +862,7 @@ void CreateTrainingBox( void );
 void CreateMercRemoveAssignBox( void );
 
 void DetermineWhichAssignmentMenusCanBeShown( void );
+void DetermineWhichMilitiaControlMenusCanBeShown( void ); //lal
 
 void DetermineIfContractMenuCanBeShown( void );
 void ContractRegionBtnCallback( MOUSE_REGION * pRegion, INT32 iReason );
@@ -3697,6 +3698,7 @@ UINT32 MapScreenHandle(void)
 	// check which menus can be shown right now
 	DetermineWhichAssignmentMenusCanBeShown( );
 
+	DetermineWhichMilitiaControlMenusCanBeShown( ); //lal
 	// determine if contract menu can be shown
 	DetermineIfContractMenuCanBeShown( );
 
@@ -6011,6 +6013,7 @@ void EndMapScreen( BOOLEAN fDuringFade )
 	// clear out mouse regions for pop up boxes
 	DetermineWhichAssignmentMenusCanBeShown( );
 
+	DetermineWhichMilitiaControlMenusCanBeShown( ); //lal
 	sSelectedMilitiaTown = 0;
 	CreateDestroyMilitiaPopUPRegions( );
 	CreateDestroyMilitiaSectorButtons( );
@@ -6024,6 +6027,7 @@ void EndMapScreen( BOOLEAN fDuringFade )
 	ghContractBox = -1;
 
   CreateDestroyAssignmentPopUpBoxes( );
+  CreateDestroyMilitiaControlPopUpBoxes( ); //lal
 
 	// shutdown movement box
 	if ( fShowMapScreenMovementList )