diff options
author | Max Horn | 2007-03-18 18:34:16 +0000 |
---|---|---|
committer | Max Horn | 2007-03-18 18:34:16 +0000 |
commit | f1497d5aa981526fd804ae637989a219548185a5 (patch) | |
tree | 8896e96e1b7feca5a5625edb0519a19c0cc94b98 /engines/cine | |
parent | 888e68f433659a1c021d79f89534841e64676987 (diff) | |
download | scummvm-rg350-f1497d5aa981526fd804ae637989a219548185a5.tar.gz scummvm-rg350-f1497d5aa981526fd804ae637989a219548185a5.tar.bz2 scummvm-rg350-f1497d5aa981526fd804ae637989a219548185a5.zip |
CINE: Make use of EventManager::getMousePos
svn-id: r26222
Diffstat (limited to 'engines/cine')
-rw-r--r-- | engines/cine/main_loop.cpp | 12 | ||||
-rw-r--r-- | engines/cine/various.h | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index b1816eae9c..7bf537b17c 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -35,6 +35,11 @@ namespace Cine { +struct mouseStatusStruct { + int left; + int right; +}; + mouseStatusStruct mouseData; uint16 mouseRight = 0; @@ -58,8 +63,6 @@ void manageEvents(int count) { mouseRight = 1; break; case Common::EVENT_MOUSEMOVE: - mouseData.X = event.mouse.x; - mouseData.Y = event.mouse.y; break; case Common::EVENT_QUIT: g_system->quit(); @@ -158,8 +161,9 @@ void manageEvents(int count) { } void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY) { - *pX = mouseData.X; - *pY = mouseData.Y; + Common::Point mouse = g_system->getEventManager()->getMousePos(); + *pX = mouse.x; + *pY = mouse.y; *pButton = 0; diff --git a/engines/cine/various.h b/engines/cine/various.h index 9784f33d34..c50941d8e5 100644 --- a/engines/cine/various.h +++ b/engines/cine/various.h @@ -172,13 +172,6 @@ void addMessage(byte param1, int16 param2, int16 param3, int16 param4, int16 par void blitScreen(byte *frontBuffer, byte *backbuffer); -struct mouseStatusStruct { - int left; - int right; - int X; - int Y; -}; - extern int16 additionalBgVScroll; void addSeqListElement(int16 param0, int16 param1, int16 param2, int16 param3, int16 param4, int16 param5, int16 param6, int16 param7, int16 param8); |