From ed00242e6909755382309295208b927f0fd2c4a7 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sun, 10 Sep 2006 01:34:33 +0000 Subject: [PATCH] "Special" and "Escape" need to both launch a lander from the surface. We used to handle this "by chance" in the old keys.cfg; as a result, this stopped working right whenever you changed input templates. I thought there was a bug report associated with this but I cannot find it. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2433 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/sc2code/planets/lander.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index a7873721e..564a2be44 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.6: +- Tweak to Lander UI - Special Weapon is now explicitly Lander Escape, + just as Warp Escape is - Michael - Default key configuration changed slightly; online display of current key bindings - Michael - Input templates can now be renamed, both online and off - Michael diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index 202939b9f..5c7b4c6dc 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -1625,7 +1625,8 @@ SetVelocityComponents ( } else if (pMS->delta_item == 0 || (HIBYTE (pMS->delta_item) - && (CurrentInputState.key[PlayerOne][KEY_ESCAPE] + && ((CurrentInputState.key[PlayerOne][KEY_ESCAPE] || + CurrentInputState.key[PlayerOne][KEY_SPECIAL]) || ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit))) { if (pMS->delta_item || pMS->CurState > EXPLOSION_LIFE + 60)