mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Alternate new shortcut "ALT + Right Mouse Button" for showing skill (traits) menu in Tactical (by Sevenfm)
- Old also working shortcut: "SHIFT + 4" - moved menu to cursor position instead of soldier's position - see (youtube): https://www.youtube.com/watch?v=RS7AKv0rWq0 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -59,6 +59,7 @@
|
||||
#include "worlddat.h" //for gtileset
|
||||
#include "Debug Control.h" //for livelog
|
||||
|
||||
#include "SkillMenu.h" // sevenfm: need this for TraitsMenu
|
||||
|
||||
|
||||
#endif
|
||||
@@ -1226,58 +1227,74 @@ void QueryRTRightButton( UINT32 *puiNewEvent )
|
||||
// ATE:
|
||||
if ( gusSelectedSoldier != NOBODY )
|
||||
{
|
||||
// Switch on UI mode
|
||||
switch( gCurrentUIMode )
|
||||
// sevenfm: ALT+RMB - TraitsMenu
|
||||
if(_KeyDown(ALT))
|
||||
{
|
||||
case IDLE_MODE:
|
||||
|
||||
break;
|
||||
|
||||
case CONFIRM_MOVE_MODE:
|
||||
case MOVE_MODE:
|
||||
case TALKCURSOR_MODE:
|
||||
|
||||
switch( gCurrentUIMode )
|
||||
{
|
||||
case MOVE_MODE:
|
||||
case TALKCURSOR_MODE:
|
||||
case ACTION_MODE:
|
||||
case CONFIRM_ACTION_MODE:
|
||||
case LOOKCURSOR_MODE:
|
||||
TraitsMenu(usMapPos);
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Switch on UI mode
|
||||
switch( gCurrentUIMode )
|
||||
{
|
||||
case IDLE_MODE:
|
||||
|
||||
break;
|
||||
|
||||
case CONFIRM_MOVE_MODE:
|
||||
case MOVE_MODE:
|
||||
case TALKCURSOR_MODE:
|
||||
|
||||
// We have here a change to action mode
|
||||
*puiNewEvent = M_CHANGE_TO_ACTION;
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case ACTION_MODE:
|
||||
|
||||
// We have here a change to move mode
|
||||
*puiNewEvent = A_END_ACTION;
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case CONFIRM_ACTION_MODE:
|
||||
|
||||
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
|
||||
{
|
||||
HandleRightClickAdjustCursor( pSoldier, usMapPos );
|
||||
}
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case MENU_MODE:
|
||||
|
||||
// If we get a hit here and we're in menu mode, quit the menu mode
|
||||
EndMenuEvent( guiCurrentEvent );
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case HANDCURSOR_MODE:
|
||||
// If we cannot actually do anything, return to movement mode
|
||||
*puiNewEvent = A_CHANGE_TO_MOVE;
|
||||
break;
|
||||
|
||||
case LOOKCURSOR_MODE:
|
||||
|
||||
// If we cannot actually do anything, return to movement mode
|
||||
*puiNewEvent = A_CHANGE_TO_MOVE;
|
||||
break;
|
||||
|
||||
}
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case ACTION_MODE:
|
||||
|
||||
// We have here a change to move mode
|
||||
*puiNewEvent = A_END_ACTION;
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case CONFIRM_ACTION_MODE:
|
||||
|
||||
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
|
||||
{
|
||||
HandleRightClickAdjustCursor( pSoldier, usMapPos );
|
||||
}
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case MENU_MODE:
|
||||
|
||||
// If we get a hit here and we're in menu mode, quit the menu mode
|
||||
EndMenuEvent( guiCurrentEvent );
|
||||
fClickIntercepted = TRUE;
|
||||
break;
|
||||
|
||||
case HANDCURSOR_MODE:
|
||||
// If we cannot actually do anything, return to movement mode
|
||||
*puiNewEvent = A_CHANGE_TO_MOVE;
|
||||
break;
|
||||
|
||||
case LOOKCURSOR_MODE:
|
||||
|
||||
// If we cannot actually do anything, return to movement mode
|
||||
*puiNewEvent = A_CHANGE_TO_MOVE;
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user