[Sc2-cvs] sc2/src/sc2code/planets lander.c,1.43,1.44

[<mcm...@us...>]

Update of /cvsroot/sc2/sc2/src/sc2code/planets
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7385/src/sc2code/planets

Modified Files:
	lander.c 
Log Message:
"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.


Index: lander.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/lander.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** lander.c	15 Apr 2006 23:12:03 -0000	1.43
--- lander.c	10 Sep 2006 01:34:33 -0000	1.44
***************
*** 1626,1630 ****
  	else if (pMS->delta_item == 0
  			|| (HIBYTE (pMS->delta_item) 
! 			&& (CurrentInputState.key[PlayerOne][KEY_ESCAPE]
  			|| ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit)))
  	{
--- 1626,1631 ----
  	else if (pMS->delta_item == 0
  			|| (HIBYTE (pMS->delta_item) 
! 			&& ((CurrentInputState.key[PlayerOne][KEY_ESCAPE] ||
! 			     CurrentInputState.key[PlayerOne][KEY_SPECIAL])
  			|| ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit)))
  	{