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

- New Feature: Added possibility to swap merc position order in tactical team panel (by silversurfer)

Browse Source 
o Just select the merc and press CTRL + Left Key for moving the merc one position to the left / CTRL + right key for moving the merc one position to the right
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/321935/Re_Drag_mercs_around_on_Merc_b.html#Post321935


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-25 06:33:47 +00:00
parent fa2fe99b1d
commit 58e9e8a7db
2 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+74
View File
@@ -261,6 +261,9 @@ void QueryTBX2Button( UINT32 *puiNewEvent );
void ItemCreationCallBack( UINT8 ubResult );
void CheatCreateItem();
// silversurfer: added for merc portrait swapping in tactical
void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection );
extern INT8 GetTeamSlotFromPlayerID( UINT8 ubID );
void GetTBMouseButtonInput( UINT32 *puiNewEvent )
{
@@ -4661,6 +4664,20 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
ToggleTacticalPanels();
}
break;
case LEFTARROW:
if ( fCtrl )
{
if ( gusSelectedSoldier != NOBODY )
SwapMercPortraits( MercPtrs[ gusSelectedSoldier ], -1 );
}
break;
case RIGHTARROW:
if ( fCtrl )
{
if ( gusSelectedSoldier != NOBODY )
SwapMercPortraits( MercPtrs[ gusSelectedSoldier ], 1 );
}
break;
}
@@ -7153,3 +7170,60 @@ void QueryTBX2Button( UINT32 *puiNewEvent )
}
}
//silversurfer: this allows swapping of merc portraits in tactical screen using CTRL+LEFTARROW / CTRL+RIGHTARROW
void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
{
// only swap mercs when the Team Panel is active
if ( gsCurInterfacePanel != TEAM_PANEL )
return;
UINT8 ubSourceMerc = gusSelectedSoldier;
UINT8 ubTargetMerc;
UINT8 ubGroupID = pSoldier->ubGroupID;
INT8 bOldPosition = GetTeamSlotFromPlayerID ( MercPtrs[ ubSourceMerc ]->ubID );
INT8 bNewPosition = bOldPosition + bDirection;
SOLDIERTYPE TempMercPtr = *MercPtrs[ ubSourceMerc ];
FACETYPE TempFace = gFacesData[ ubSourceMerc +1 ];
// check if new position is occupied by another merc? we won't replace an empty slot
if ( gTeamPanel[ bNewPosition ].fOccupied && gTeamPanel[ bNewPosition ].ubID != NOBODY )
{
ubTargetMerc = gTeamPanel[ bNewPosition ].ubID;
// swap the data
*MercPtrs[ ubSourceMerc ] = *MercPtrs[ ubTargetMerc ];
*MercPtrs[ ubTargetMerc ] = TempMercPtr;
// also swap face data, otherwise face gear, opp count etc won't update
gFacesData[ ubSourceMerc +1 ] = gFacesData[ ubTargetMerc +1 ];
gFacesData[ ubTargetMerc +1 ] = TempFace;
// update IDs in the data so they match array index again
MercPtrs[ ubSourceMerc ]->ubID = ubSourceMerc;
MercPtrs[ ubTargetMerc ]->ubID = ubTargetMerc;
gFacesData[ ubSourceMerc +1 ].iID = ubSourceMerc +1;
gFacesData[ ubTargetMerc +1 ].iID = ubTargetMerc +1;
// update soldier ID so they match array index again
gFacesData[ ubSourceMerc +1 ].ubSoldierID = ubSourceMerc;
gFacesData[ ubTargetMerc +1 ].ubSoldierID = ubTargetMerc;
// update face index in merc data
MercPtrs[ ubSourceMerc ]->iFaceIndex = ubSourceMerc +1;
MercPtrs[ ubTargetMerc ]->iFaceIndex = ubTargetMerc +1;
// update group info
RemovePlayerFromGroup( ubGroupID, MercPtrs[ ubSourceMerc ] );
RemovePlayerFromGroup( ubGroupID, MercPtrs[ ubTargetMerc ] );
AddPlayerToGroup( ubGroupID, MercPtrs[ ubSourceMerc ] );
AddPlayerToGroup( ubGroupID, MercPtrs[ ubTargetMerc ] );
// don't forget to renew selection of merc
gusSelectedSoldier = ubTargetMerc;
// refresh interface
fCharacterInfoPanelDirty = TRUE;
fTeamPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2;
}
}
TileEngine/renderworld.cpp
+2 -1
View File
@@ -3572,7 +3572,8 @@ void ScrollWorld( )
return;
// Ignore if ALT DONW
if ( _KeyDown( ALT ) )
// silversurfer: also ignore CTRL because this is now used for merc portrait switching
if ( _KeyDown(ALT) || _KeyDown(CTRL) )
return;