[PlaneShift-svn] SF.net SVN: planeshift:[8839] trunk/src/client/pscharcontrol.cpp

[<ral...@us...>]

Revision: 8839
          http://sourceforge.net/p/planeshift/code/8839
Author:   ralphcampbell
Date:     2013-10-01 16:15:05 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Fix bug 6077 - GetPSMouseMods() doesn't get modifiers correctly

Modified Paths:
--------------
    trunk/src/client/pscharcontrol.cpp

Modified: trunk/src/client/pscharcontrol.cpp
===================================================================
--- trunk/src/client/pscharcontrol.cpp	2013-10-01 16:13:55 UTC (rev 8838)
+++ trunk/src/client/pscharcontrol.cpp	2013-10-01 16:15:05 UTC (rev 8839)
@@ -136,7 +136,10 @@
         return 0;
     }
     uint32 modifiers;
-    event->Retrieve("keyModifiers", modifiers);
+    const void* m;
+    size_t mSize;
+    (void) event->Retrieve("keyModifiers", m, mSize);
+    modifiers = csKeyEventHelper::GetModifiersBits (*((csKeyModifiers*)m));
     return modifiers & PS_MODS_MASK;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.