Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add keyboard shortcuts to "guard position" and "go to transport". Patch by 

lolando@debian.org, this closes ticket:806


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7953 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-08-11 20:24:57 +00:00 committed by Git SVN Gateway
parent dc6e361d9e
commit aca362c350
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keybind.c
View File

@ -2181,6 +2181,12 @@ void kf_SetDroidMoveHold( void )
} }
} }
// --------------------------------------------------------------------------
void kf_SetDroidMoveGuard( void )
{
kfsf_SetSelectedDroidsState(DSO_HALTTYPE,DSS_HALT_GUARD);
}
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
void kf_SetDroidMovePursue( void ) void kf_SetDroidMovePursue( void )
{ {
@ -2199,6 +2205,12 @@ void kf_SetDroidReturnToBase( void )
kfsf_SetSelectedDroidsState(DSO_RETURN_TO_LOC,DSS_RTL_BASE); kfsf_SetSelectedDroidsState(DSO_RETURN_TO_LOC,DSS_RTL_BASE);
} }
// --------------------------------------------------------------------------
void kf_SetDroidGoToTransport( void )
{
kfsf_SetSelectedDroidsState(DSO_RETURN_TO_LOC,DSS_RTL_TRANSPORT);
}
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
void kf_SetDroidGoForRepair( void ) void kf_SetDroidGoForRepair( void )
{ {

2
src/keybind.h
View File

@ -148,10 +148,12 @@ extern void kf_SetDroidAttackReturn( void );
extern void kf_SetDroidAttackCease( void ); extern void kf_SetDroidAttackCease( void );
extern void kf_SetDroidMoveHold( void ); extern void kf_SetDroidMoveHold( void );
extern void kf_SetDroidMoveGuard( void );
extern void kf_SetDroidMovePursue( void ); //not there? extern void kf_SetDroidMovePursue( void ); //not there?
extern void kf_SetDroidMovePatrol( void ); // not there? extern void kf_SetDroidMovePatrol( void ); // not there?
extern void kf_SetDroidReturnToBase( void ); extern void kf_SetDroidReturnToBase( void );
extern void kf_SetDroidGoToTransport( void );
extern void kf_SetDroidGoForRepair( void ); extern void kf_SetDroidGoForRepair( void );
extern void kf_SetDroidRecycle( void ); extern void kf_SetDroidRecycle( void );
extern void kf_ScatterDroids( void ); extern void kf_ScatterDroids( void );

4
src/keymap.c
View File

@ -251,6 +251,8 @@ _keymapsave keyMapSaveTable[] =
kf_ToggleShowGateways, kf_ToggleShowGateways,
kf_ToggleShowPath, kf_ToggleShowPath,
kf_MapCheck, kf_MapCheck,
kf_SetDroidGoToTransport,
kf_SetDroidMoveGuard,
NULL // last function! NULL // last function!
}; };
@ -383,6 +385,7 @@ void keyInitMappings( BOOL bForceDefaults )
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_D,KEYMAP_PRESSED,kf_JumpToUnassignedUnits, _("View Unassigned Units")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_D,KEYMAP_PRESSED,kf_JumpToUnassignedUnits, _("View Unassigned Units"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_E,KEYMAP_PRESSED,kf_SetDroidAttackReturn, _("Return Fire")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_E,KEYMAP_PRESSED,kf_SetDroidAttackReturn, _("Return Fire"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_F,KEYMAP_PRESSED,kf_SetDroidAttackAtWill, _("Fire at Will")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_F,KEYMAP_PRESSED,kf_SetDroidAttackAtWill, _("Fire at Will"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_G,KEYMAP_PRESSED,kf_SetDroidMoveGuard, _("Guard Position"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_H,KEYMAP_PRESSED,kf_SetDroidReturnToBase, _("Return to HQ")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_H,KEYMAP_PRESSED,kf_SetDroidReturnToBase, _("Return to HQ"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_I,KEYMAP_PRESSED,kf_SetDroidRangeDefault, _("Optimum Range")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_I,KEYMAP_PRESSED,kf_SetDroidRangeDefault, _("Optimum Range"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_O,KEYMAP_PRESSED,kf_SetDroidRangeShort, _("Short Range")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_O,KEYMAP_PRESSED,kf_SetDroidRangeShort, _("Short Range"));
@ -390,6 +393,7 @@ void keyInitMappings( BOOL bForceDefaults )
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_Q,KEYMAP_PRESSED,kf_SetDroidMovePatrol , _("Patrol")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_Q,KEYMAP_PRESSED,kf_SetDroidMovePatrol , _("Patrol"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_R,KEYMAP_PRESSED,kf_SetDroidGoForRepair , _("Return For Repair")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_R,KEYMAP_PRESSED,kf_SetDroidGoForRepair , _("Return For Repair"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_S,KEYMAP_PRESSED,kf_SetDroidMoveHold , _("Hold Position")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_S,KEYMAP_PRESSED,kf_SetDroidMoveHold , _("Hold Position"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_T,KEYMAP_PRESSED,kf_SetDroidGoToTransport, _("Go to Transport"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_RETURN,KEYMAP_PRESSED,kf_SendTextMessage, _("Send Text Message")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_RETURN,KEYMAP_PRESSED,kf_SendTextMessage, _("Send Text Message"));
keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_U,KEYMAP_PRESSED,kf_SetDroidRangeLong, _("Long Range")); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_U,KEYMAP_PRESSED,kf_SetDroidRangeLong, _("Long Range"));