diff options
author | Strangerke | 2012-12-11 08:31:07 +0100 |
---|---|---|
committer | Strangerke | 2012-12-11 08:31:07 +0100 |
commit | d274441e12e7112620747a5129bb2af77cdb852f (patch) | |
tree | fcb11fbd2d6b688e9ee9a655aad3e48520cb3621 /engines/hopkins/events.h | |
parent | 299fbfc7c7558cd8275b86ef746ba73ea5ecbee2 (diff) | |
download | scummvm-rg350-d274441e12e7112620747a5129bb2af77cdb852f.tar.gz scummvm-rg350-d274441e12e7112620747a5129bb2af77cdb852f.tar.bz2 scummvm-rg350-d274441e12e7112620747a5129bb2af77cdb852f.zip |
HOPKINS: Some more renaming
Diffstat (limited to 'engines/hopkins/events.h')
-rw-r--r-- | engines/hopkins/events.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/engines/hopkins/events.h b/engines/hopkins/events.h index fef8c2a4c2..530a3f8121 100644 --- a/engines/hopkins/events.h +++ b/engines/hopkins/events.h @@ -53,25 +53,24 @@ public: Common::Point _mousePos; bool _breakoutFl; int _oldIconId; - int souris_n; - int souris_bb; - int souris_b; + int _mouseSpriteId; + int _curMouseButton; + int _mouseButton; byte *_mouseCursor; uint32 _gameCounter; - uint32 lItCounter; + uint32 _rateCounter; uint32 _priorCounterTime; uint32 _priorFrameTime; bool _escKeyFl; bool _disableEscKeyFl; DIALOG_KEY _gameKey; - int btsouris; + int _mouseCursorId; byte *_objectBuf; bool _keyState[256]; public: EventsManager(); ~EventsManager(); void setParent(HopkinsEngine *vm); - void setMouseOn(); void setMouseXY(int xp, int yp); int getMouseX(); @@ -80,16 +79,11 @@ public: void mouseOn(); void mouseOff(); void changeMouseCursor(int id); - - void CONTROLE_MES(); + void refreshEvents(); void delay(int delay); - void VBL(); + int waitKeyPress(); - /** - * Waits for a keypress, ignoring mouse events - * @return Keypress, or -1 if game quit was requested - */ - int keywin(); + void VBL(); }; } // End of namespace Hopkins |