[Planeshift-cvs] CVS: planeshift/src/client pscharcontrol.h,1.57,1.58

[Mike G. <xo...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3035/src/client

Modified Files:
	pscharcontrol.h 
Log Message:
- Patch from Vegar to fix bug #1032.

Index: pscharcontrol.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscharcontrol.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** pscharcontrol.h	15 Aug 2005 01:01:34 -0000	1.57
--- pscharcontrol.h	20 Aug 2005 19:26:52 -0000	1.58
***************
*** 318,321 ****
--- 318,322 ----
      bool            RemapTrigger(const char* name, PSCONTROL type,uint trigger,uint32 mods);
      psControl*      GetTrigger  (const char* name);
+     psControl*      GetTrigger(uint32 trigger,uint32 mods,PSCONTROL type);
      void            Untoggle    (const char* name);
  
***************
*** 351,355 ****
      bool IsMousePressed(uint button,uint32 mods);
  
-     psControl*      GetTrigger(uint32 trigger,uint32 mods,PSCONTROL type);
      psControl*      CreateTrigger(PSCONTROL type);
  
--- 352,355 ----