|
From: <cn...@us...> - 2009-06-27 22:22:11
|
Revision: 378
http://hgengine.svn.sourceforge.net/hgengine/?rev=378&view=rev
Author: cnlohr
Date: 2009-06-27 22:22:09 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Classify the mouse enumeration - there is an issue at global scope
Modified Paths:
--------------
Mercury2/src/MercuryInput.cpp
Mercury2/src/MercuryInput.h
Modified: Mercury2/src/MercuryInput.cpp
===================================================================
--- Mercury2/src/MercuryInput.cpp 2009-06-27 22:17:04 UTC (rev 377)
+++ Mercury2/src/MercuryInput.cpp 2009-06-27 22:22:09 UTC (rev 378)
@@ -13,9 +13,9 @@
mi->dy = dy;
uint8_t buttonMasks = 0;
- buttonMasks |= (leftButton << MB_LEFT); //enable if true
- buttonMasks |= (rightButton << MB_RIGHT); //enable if true
- buttonMasks |= (centerButton << MB_CENTER); //enable if true
+ buttonMasks |= (leftButton << MOUSE_LEFT); //enable if true
+ buttonMasks |= (rightButton << MOUSE_RIGHT); //enable if true
+ buttonMasks |= (centerButton << MOUSE_CENTER); //enable if true
mi->buttonMasks = buttonMasks;
currentButtonMasks = buttonMasks;
Modified: Mercury2/src/MercuryInput.h
===================================================================
--- Mercury2/src/MercuryInput.h 2009-06-27 22:17:04 UTC (rev 377)
+++ Mercury2/src/MercuryInput.h 2009-06-27 22:22:09 UTC (rev 378)
@@ -6,13 +6,6 @@
const MString INPUTEVENT_MOUSE = "MouseInputEvent";
const MString INPUTEVENT_KEYBOARD = "KeyboardInputEvent";
-enum MouseButton
-{
- MB_NONE = 0,
- MB_LEFT = 1,
- MB_RIGHT = 2,
- MB_CENTER = 3
-};
class MouseInput : public MessageData
{
@@ -22,6 +15,15 @@
MouseInput();
int32_t dx, dy;
uint8_t buttonMasks;
+
+ enum MouseButton
+ {
+ MOUSE_NONE = 0,
+ MOUSE_LEFT = 1,
+ MOUSE_RIGHT = 2,
+ MOUSE_CENTER = 3
+ };
+
private:
static uint8_t currentButtonMasks;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|