aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorRobert Göffringmann2003-06-06 01:14:17 +0000
committerRobert Göffringmann2003-06-06 01:14:17 +0000
commit8e8c702e65ec4170bd8c4c8b6d89d4c97db1a5e1 (patch)
treebd0ad5e3dbdbfc6b467c2bc7c111054636fb3f77 /sky
parentddf44b02757cb270f0dbdfd414e7cb3792251f21 (diff)
downloadscummvm-rg350-8e8c702e65ec4170bd8c4c8b6d89d4c97db1a5e1.tar.gz
scummvm-rg350-8e8c702e65ec4170bd8c4c8b6d89d4c97db1a5e1.tar.bz2
scummvm-rg350-8e8c702e65ec4170bd8c4c8b6d89d4c97db1a5e1.zip
forgot to implement right mousebutton. :)
svn-id: r8343
Diffstat (limited to 'sky')
-rw-r--r--sky/mouse.h2
-rw-r--r--sky/sky.cpp5
-rw-r--r--sky/sky.h1
3 files changed, 3 insertions, 5 deletions
diff --git a/sky/mouse.h b/sky/mouse.h
index 784b7f2908..22fa5bf81a 100644
--- a/sky/mouse.h
+++ b/sky/mouse.h
@@ -46,7 +46,7 @@ public:
void drawNewMouse(void);
void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY);
void useLogicInstance(SkyLogic *skyLogic) { _skyLogic = skyLogic; };
- void buttonPressed(void) { _bMouseB = 1; };
+ void buttonPressed(uint8 button) { _bMouseB = button; };
uint16 giveMouseX(void) { return _aMouseX; };
uint16 giveMouseY(void) { return _aMouseY; };
diff --git a/sky/sky.cpp b/sky/sky.cpp
index d68237b3d6..ecfe120dcf 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -286,8 +286,7 @@ void SkyState::delay(uint amount) { //copied and mutilated from Simon.cpp
break;
case OSystem::EVENT_LBUTTONDOWN:
- _left_button_down++;
- _skyMouse->buttonPressed();
+ _skyMouse->buttonPressed(1);
#ifdef _WIN32_WCE
_sdl_mouse_x = event.mouse.x;
_sdl_mouse_y = event.mouse.y;
@@ -295,7 +294,7 @@ void SkyState::delay(uint amount) { //copied and mutilated from Simon.cpp
break;
case OSystem::EVENT_RBUTTONDOWN:
-
+ _skyMouse->buttonPressed(2);
break;
default:
diff --git a/sky/sky.h b/sky/sky.h
index fcbc1f0484..cd6e49fe6a 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -65,7 +65,6 @@ protected:
uint16 _debugMode;
uint16 _debugLevel;
- uint _left_button_down;
int _numScreenUpdates;