Index: D:/JA2/Source/Strategic/Assignments.cpp
===================================================================
--- D:/JA2/Source/Strategic/Assignments.cpp (revision 6441)
+++ D:/JA2/Source/Strategic/Assignments.cpp (working copy)
@@ -7269,13 +7269,13 @@

if( ( fShowRepairMenu == TRUE ) && ( fCreated == FALSE ) )
{
- CheckAndUpdateTacticalAssignmentPopUpPositions( );
+ // Moa: removed below: repositioning now the same way as for training in AssignmentMenuBtnCB as it caused missplaced box for higher resolutions then 3.
+ //CheckAndUpdateTacticalAssignmentPopUpPositions( );
+ //if( ( fShowRepairMenu ) && ( guiCurrentScreen == MAP_SCREEN ) )
+ //{
+ // //SetBoxPosition( ghRepairBox ,RepairPosition);
+ //}

- if( ( fShowRepairMenu ) && ( guiCurrentScreen == MAP_SCREEN ) )
- {
- //SetBoxPosition( ghRepairBox ,RepairPosition);
- }
-
// grab height of font
iFontHeight = GetLineSpace( ghRepairBox ) + GetFontHeight( GetBoxFont( ghRepairBox ) );

@@ -10232,6 +10232,7 @@
if( DisplayRepairMenu( pSoldier ) )
{
fShowRepairMenu = TRUE;
+ DetermineBoxPositions( );
}

}
@@ -10285,6 +10286,7 @@
if( DisplayMoveItemsMenu( pSoldier ) )
{
fShowMoveItemMenu = TRUE;
+ DetermineBoxPositions( );
}
}
}
@@ -11237,18 +11239,20 @@

if( ( fShowRepairMenu == TRUE ) && ( ghRepairBox != -1 ) )
{
- CreateDestroyMouseRegionForRepairMenu( );
+ //CreateDestroyMouseRegionForRepairMenu( );
pNewPoint.iY += ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_REPAIR );

SetBoxPosition( ghRepairBox, pNewPoint );
+ CreateDestroyMouseRegionForRepairMenu( );
}

if( ( fShowMoveItemMenu == TRUE ) && ( ghMoveItemBox != -1 ) )
{
- CreateDestroyMouseRegionForMoveItemMenu( );
+ //CreateDestroyMouseRegionForMoveItemMenu( );
pNewPoint.iY += ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_MOVE_ITEMS );

SetBoxPosition( ghMoveItemBox, pNewPoint );
+ CreateDestroyMouseRegionForMoveItemMenu( );
}

if( ( fShowTrainingMenu == TRUE ) && ( ghTrainingBox != -1 ) )
@@ -17838,13 +17842,13 @@

if( ( fShowMoveItemMenu == TRUE ) && ( fCreated == FALSE ) )
{
- CheckAndUpdateTacticalAssignmentPopUpPositions( );
+ // Moa: removed below: repositioning now the same way as for training in AssignmentMenuBtnCB as it caused missplaced box for higher resolutions then 3.
+ //CheckAndUpdateTacticalAssignmentPopUpPositions( );
+ //if( ( fShowMoveItemMenu ) && ( guiCurrentScreen == MAP_SCREEN ) )
+ //{
+ // //SetBoxPosition( ghMoveItemBox ,RepairPosition);
+ //}

- if( ( fShowMoveItemMenu ) && ( guiCurrentScreen == MAP_SCREEN ) )
- {
- //SetBoxPosition( ghMoveItemBox ,RepairPosition);
- }
-
// grab height of font
iFontHeight = GetLineSpace( ghMoveItemBox ) + GetFontHeight( GetBoxFont( ghMoveItemBox ) );