1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhancements (by Buggler)

Browse Source 
- Allows all mercs cover display view by using hotkey '='; multi-selected mercs view only possible in realtime mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-01 13:00:44 +00:00
parent e7bd32dad9
commit 7440dd5745
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI.cpp
+5 -5
View File
@@ -2106,7 +2106,7 @@ UINT32 UIHandleCMoveMerc( UI_EVENT *pUIEvent )
//StartLooseCursor( sMapPos, 0 );
}
if ( gTacticalStatus.fAtLeastOneGuyOnMultiSelect && pIntTile == NULL )
if ( gTacticalStatus.fAtLeastOneGuyOnMultiSelect && pIntTile == NULL && !( gTacticalStatus.uiFlags & INCOMBAT ) )
{
HandleMultiSelectionMove( sDestGridNo );
}
@@ -5153,7 +5153,7 @@ UINT32 UIHandleLCLook( UI_EVENT *pUIEvent )
return( GAME_SCREEN );
}
if ( gTacticalStatus.fAtLeastOneGuyOnMultiSelect )
if ( gTacticalStatus.fAtLeastOneGuyOnMultiSelect && !( gTacticalStatus.uiFlags & INCOMBAT ) )
{
// OK, loop through all guys who are 'multi-selected' and
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
@@ -5464,7 +5464,7 @@ void EndMultiSoldierSelection( BOOLEAN fAcknowledge )
// OK, loop through all guys who are 'multi-selected' and
// check if our currently selected guy is amoung the
// check if our currently selected guy is among the
// lucky few.. if not, change to a guy who is...
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++, pSoldier++ )
@@ -5507,7 +5507,7 @@ void EndMultiSoldierSelection( BOOLEAN fAcknowledge )
void StopRubberBandedMercFromMoving( )
{
if ( !gTacticalStatus.fAtLeastOneGuyOnMultiSelect )
if ( !gTacticalStatus.fAtLeastOneGuyOnMultiSelect || ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
return;
}
@@ -5515,7 +5515,7 @@ void StopRubberBandedMercFromMoving( )
INT32 cnt;
// OK, loop through all guys who are 'multi-selected' and
// check if our currently selected guy is amoung the
// check if our currently selected guy is among the
// lucky few.. if not, change to a guy who is...
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++, pSoldier++ )