diff options
| author | Max Horn | 2007-03-18 18:27:52 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-18 18:27:52 +0000 |
| commit | 888e68f433659a1c021d79f89534841e64676987 (patch) | |
| tree | 9af7d4f573de71695bd010be83865f7aa18514ad /engines/kyra/kyra.h | |
| parent | 8ba2a5bb83c23a9633ae532a02ffdb60760a3cb9 (diff) | |
| download | scummvm-rg350-888e68f433659a1c021d79f89534841e64676987.tar.gz scummvm-rg350-888e68f433659a1c021d79f89534841e64676987.tar.bz2 scummvm-rg350-888e68f433659a1c021d79f89534841e64676987.zip | |
KYRA: Changed to use EventManager::getMousePos (should improve some things: the old code did not properly track the mouse upon click events, and KyraEngine::waitForEvent ignored _flags.useHiResOverlay)
svn-id: r26221
Diffstat (limited to 'engines/kyra/kyra.h')
| -rw-r--r-- | engines/kyra/kyra.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index ea3a67c02f..8b337eb058 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -305,13 +305,12 @@ public: void disableTimer(uint8 timer); void delayWithTicks(int ticks); - + void saveGame(const char *fileName, const char *saveName); void loadGame(const char *fileName); - int mouseX() { return _mouseX; } - int mouseY() { return _mouseY; } - + Common::Point getMousePos() const; + int setGameFlag(int flag); int queryGameFlag(int flag); int resetGameFlag(int flag); @@ -531,7 +530,7 @@ protected: void setBrandonPoisonFlags(int reset); void resetBrandonPoisonFlags(); - void processInput(int xpos, int ypos); + void processInput(); int processInputHelper(int xpos, int ypos); int clickEventHandler(int xpos, int ypos); void clickEventHandler2(); @@ -707,7 +706,6 @@ protected: uint16 _gameSpeed; uint16 _tickLength; int _lang; - int _mouseX, _mouseY; int8 _itemInHand; int _mouseState; bool _handleInput; |