Package: warzone2100 Version: 2.2.1+dfsg1-1 Severity: wishlist Tags: patch Hi,
There are a few orders for which one cannot set keyboard shortcuts. I found at least three: "guard position", "go to transport" and "recycle". I haven't played enough to get to the point where I could grasp the difference between "recycle" and "return for recycling", but I created a patch adding shortcuts for the other two. I chose "g" and "t" as default bindings, as they seemed to be free by a stroke of luck. Thanks for maintaining this package :-)
diff -ru warzone2100-2.2.1+dfsg1/debian/changelog warzone2100-2.2.1+dfsg1+shortcuts/debian/changelog --- warzone2100-2.2.1+dfsg1/debian/changelog 2009-08-10 18:02:56.000000000 +0200 +++ warzone2100-2.2.1+dfsg1+shortcuts/debian/changelog 2009-08-10 17:27:35.000000000 +0200 @@ -1,3 +1,10 @@ +warzone2100 (2.2.1+dfsg1-1+lolando) unstable; urgency=low + + * Added missing shortcuts for "go to transport" and "guard position" + commands. + + -- Roland Mas <[email protected]> Mon, 10 Aug 2009 16:13:01 +0200 + warzone2100 (2.2.1+dfsg1-1) unstable; urgency=low [ Paul Wise ] diff -ru warzone2100-2.2.1+dfsg1/src/keybind.c warzone2100-2.2.1+dfsg1+shortcuts/src/keybind.c --- warzone2100-2.2.1+dfsg1/src/keybind.c 2009-06-21 17:15:40.000000000 +0200 +++ warzone2100-2.2.1+dfsg1+shortcuts/src/keybind.c 2009-08-10 17:20:06.000000000 +0200 @@ -2172,6 +2172,12 @@ } // -------------------------------------------------------------------------- +void kf_SetDroidMoveGuard( void ) +{ + kfsf_SetSelectedDroidsState(DSO_HALTTYPE,DSS_HALT_GUARD); +} + +// -------------------------------------------------------------------------- void kf_SetDroidMovePursue( void ) { kfsf_SetSelectedDroidsState(DSO_HALTTYPE,DSS_HALT_PURSUE); // ASK? @@ -2190,6 +2196,12 @@ } // -------------------------------------------------------------------------- +void kf_SetDroidGoToTransport( void ) +{ + kfsf_SetSelectedDroidsState(DSO_RETURN_TO_LOC,DSS_RTL_TRANSPORT); +} + +// -------------------------------------------------------------------------- void kf_SetDroidGoForRepair( void ) { kfsf_SetSelectedDroidsState(DSO_RETURN_TO_LOC,DSS_RTL_REPAIR); diff -ru warzone2100-2.2.1+dfsg1/src/keybind.h warzone2100-2.2.1+dfsg1+shortcuts/src/keybind.h --- warzone2100-2.2.1+dfsg1/src/keybind.h 2009-06-21 17:15:40.000000000 +0200 +++ warzone2100-2.2.1+dfsg1+shortcuts/src/keybind.h 2009-08-10 17:22:14.000000000 +0200 @@ -148,10 +148,12 @@ extern void kf_SetDroidAttackCease( void ); extern void kf_SetDroidMoveHold( void ); +extern void kf_SetDroidMoveGuard( void ); extern void kf_SetDroidMovePursue( void ); //not there? extern void kf_SetDroidMovePatrol( void ); // not there? extern void kf_SetDroidReturnToBase( void ); +extern void kf_SetDroidGoToTransport( void ); extern void kf_SetDroidGoForRepair( void ); extern void kf_SetDroidRecycle( void ); extern void kf_ScatterDroids( void ); diff -ru warzone2100-2.2.1+dfsg1/src/keymap.c warzone2100-2.2.1+dfsg1+shortcuts/src/keymap.c --- warzone2100-2.2.1+dfsg1/src/keymap.c 2009-06-21 17:15:40.000000000 +0200 +++ warzone2100-2.2.1+dfsg1+shortcuts/src/keymap.c 2009-08-10 17:43:35.000000000 +0200 @@ -251,6 +251,8 @@ kf_ToggleShowGateways, kf_ToggleShowPath, kf_MapCheck, + kf_SetDroidGoToTransport, + kf_SetDroidMoveGuard, NULL // last function! }; @@ -384,12 +386,14 @@ 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_H,KEYMAP_PRESSED,kf_SetDroidReturnToBase, _("Return to HQ")); + keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_T,KEYMAP_PRESSED,kf_SetDroidGoToTransport, _("Go to Transport")); 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_P,KEYMAP_PRESSED,kf_SetDroidMovePursue , _("Pursue")); 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_S,KEYMAP_PRESSED,kf_SetDroidMoveHold , _("Hold Position")); + keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_G,KEYMAP_PRESSED,kf_SetDroidMoveGuard, _("Guard Position")); 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"));
-- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.30-1-686 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages warzone2100 depends on: ii libc6 2.9-23 GNU C Library: Shared libraries ii libgcc1 1:4.4.1-1 GCC support library ii libgl1-mesa-glx [l 7.5-3 A free implementation of the OpenG ii libglc0 0.7.2-1 QuesoGLC GLC implementation ii libglu1-mesa [libg 7.5-3 The OpenGL utility library (GLU) ii libogg0 1.1.4~dfsg-1 Ogg bitstream library ii libopenal1 1:1.8.466-2 Software implementation of the Ope ii libphysfs1 2.0.0-3 filesystem abstraction library for ii libpng12-0 1.2.38-1 PNG library - runtime ii libpopt0 1.14-4 lib for parsing cmdline parameters ii libsdl-net1.2 1.2.7-2 network library for Simple DirectM ii libsdl1.2debian 1.2.13-4+b1 Simple DirectMedia Layer ii libstdc++6 4.4.1-1 The GNU Standard C++ Library v3 ii libtheora0 1.0-2.1 The Theora Video Compression Codec ii libvorbis0a 1.2.0.dfsg-5+b1 The Vorbis General Audio Compressi ii libvorbisfile3 1.2.0.dfsg-5+b1 The Vorbis General Audio Compressi ii libx11-6 2:1.2.2-1 X11 client-side library ii warzone2100-data 2.2.1+dfsg1-1+lolando data files for warzone2100 Versions of packages warzone2100 recommends: ii warzone2100-music 2.2.1+dfsg1-1+lolando official music for warzone2100 ii warzone2100-video 2.2-1 official videos for warzone2100 warzone2100 suggests no packages. -- no debconf information -- Roland Mas Au royaume des aveugles, les borgnes n'ont qu'un oeil.
