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

With ALTERNATE_MOUSE_COMMANDS = TRUE, mouse wheel allows to change active interface level.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-12-31 20:46:44 +00:00
parent 9dbad2ace5
commit 27c0d1f8fe
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Real Time Input.cpp
+4 -2
View File
@@ -148,6 +148,8 @@ extern void HandleTBPickUpBackpacks( void );
extern void HandleTBDropBackpacks( void ); extern void HandleTBDropBackpacks( void );
extern void HandleTBLocatePrevMerc( void ); extern void HandleTBLocatePrevMerc( void );
extern void HandleTBLocateNextMerc( void ); extern void HandleTBLocateNextMerc( void );
extern void HandleTBLevelDown(void);
extern void HandleTBLevelUp(void);
extern void HandleTBSwapGoogles( void ); extern void HandleTBSwapGoogles( void );
extern void HandleTBSwapSidearm( void ); extern void HandleTBSwapSidearm( void );
extern void HandleTBSwapKnife( void ); extern void HandleTBSwapKnife( void );
@@ -1957,7 +1959,7 @@ void HandleAltMouseRTWheel(void)
else if (_KeyDown(SHIFT)) // SHIFT else if (_KeyDown(SHIFT)) // SHIFT
HandleTBCycleThroughVisibleEnemiesBackward(); HandleTBCycleThroughVisibleEnemiesBackward();
else else
; HandleTBLevelUp();
} }
else // wheel down else // wheel down
{ {
@@ -1983,7 +1985,7 @@ void HandleAltMouseRTWheel(void)
else if (_KeyDown(SHIFT)) // SHIFT else if (_KeyDown(SHIFT)) // SHIFT
HandleTBCycleThroughVisibleEnemies(); HandleTBCycleThroughVisibleEnemies();
else else
; HandleTBLevelDown();
} }
} }
} }
Tactical/Turn Based Input.cpp
+37 -3
View File
@@ -336,6 +336,8 @@ void HandleTBGotoHigherStance(void);
void HandleTBGotoLowerStance(void); void HandleTBGotoLowerStance(void);
void HandleTBLocateNextMerc( void ); void HandleTBLocateNextMerc( void );
void HandleTBLocatePrevMerc( void ); void HandleTBLocatePrevMerc( void );
void HandleTBLevelDown(void);
void HandleTBLevelUp(void);
void HandleTBDropBackpacks( void ); void HandleTBDropBackpacks( void );
void HandleTBPickUpBackpacks( void ); void HandleTBPickUpBackpacks( void );
void HandleTBSoldierRun( void ); void HandleTBSoldierRun( void );
@@ -5614,7 +5616,7 @@ void HandleRadioCursorClick(INT32 usMapPos, UINT32 *puiNewEvent)
INT32 sMoveSpot = usMapPos; INT32 sMoveSpot = usMapPos;
BOOLEAN fClimbingNecessary; BOOLEAN fClimbingNecessary;
INT32 sClimbSpot; INT32 sClimbSpot;
INT32 iPathCost = EstimatePathCostToLocation(pTMilitiaSoldier, sMoveSpot, gsInterfaceLevel, FALSE, &fClimbingNecessary, &sClimbSpot); INT32 iPathCost = EstimatePathCostToLocation(pTMilitiaSoldier, sMoveSpot, (INT8)gsInterfaceLevel, FALSE, &fClimbingNecessary, &sClimbSpot);
// See if we can get there // See if we can get there
if (iPathCost > 0) if (iPathCost > 0)
@@ -7251,7 +7253,7 @@ void HandleAltMouseTBWheel( void )
else if (_KeyDown(SHIFT)) // SHIFT else if (_KeyDown(SHIFT)) // SHIFT
HandleTBCycleThroughVisibleEnemiesBackward(); HandleTBCycleThroughVisibleEnemiesBackward();
else else
; HandleTBLevelUp();
} }
else // wheel down else // wheel down
{ {
@@ -7277,7 +7279,7 @@ void HandleAltMouseTBWheel( void )
else if (_KeyDown(SHIFT)) // SHIFT else if (_KeyDown(SHIFT)) // SHIFT
HandleTBCycleThroughVisibleEnemies(); HandleTBCycleThroughVisibleEnemies();
else else
; HandleTBLevelDown();
} }
} }
} }
@@ -8196,6 +8198,38 @@ void HandleTBLocatePrevMerc( void )
} }
} }
void HandleTBLevelDown(void)
{
if (gsInterfaceLevel > 0 &&
gpItemPointer == NULL &&
(gsCurInterfacePanel != SM_PANEL || ButtonList[iSMPanelButtons[UPDOWN_BUTTON]]->uiFlags & BUTTON_ENABLED))
{
UIHandleChangeLevel(NULL);
if (gsCurInterfacePanel == SM_PANEL)
{
// Remember soldier's new value
gpSMCurrentMerc->bUIInterfaceLevel = (INT8)gsInterfaceLevel;
}
}
}
void HandleTBLevelUp(void)
{
if (gsInterfaceLevel == 0 &&
gpItemPointer == NULL &&
(gsCurInterfacePanel != SM_PANEL || ButtonList[iSMPanelButtons[UPDOWN_BUTTON]]->uiFlags & BUTTON_ENABLED))
{
UIHandleChangeLevel(NULL);
if (gsCurInterfacePanel == SM_PANEL)
{
// Remember soldier's new value
gpSMCurrentMerc->bUIInterfaceLevel = (INT8)gsInterfaceLevel;
}
}
}
void HandleTBDropBackpacks( void ) void HandleTBDropBackpacks( void )
{ {
//if( UsingNewInventorySystem() && gusSelectedSoldier != NOBODY ) //if( UsingNewInventorySystem() && gusSelectedSoldier != NOBODY )