diff options
| author | Filippos Karapetis | 2015-12-24 19:12:02 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-12-24 19:12:02 +0200 |
| commit | a5553b319706e2421202fecd44d3a771ebc22ebf (patch) | |
| tree | 355a02a7d10a116a6a5f2a6650d96962e20c6e08 /engines/lab/eventman.h | |
| parent | 19303c49cf8284a7c56f08f0902a8c4cf71f8f32 (diff) | |
| download | scummvm-rg350-a5553b319706e2421202fecd44d3a771ebc22ebf.tar.gz scummvm-rg350-a5553b319706e2421202fecd44d3a771ebc22ebf.tar.bz2 scummvm-rg350-a5553b319706e2421202fecd44d3a771ebc22ebf.zip | |
Use Common::Keycode and enums in interface buttons
Diffstat (limited to 'engines/lab/eventman.h')
| -rw-r--r-- | engines/lab/eventman.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h index f0e04fcb55..3a10fb98e7 100644 --- a/engines/lab/eventman.h +++ b/engines/lab/eventman.h @@ -46,11 +46,6 @@ enum MessageClasses { kMessageDeltaMove }; -#define VKEY_UPARROW 273 -#define VKEY_DNARROW 274 -#define VKEY_RTARROW 275 -#define VKEY_LTARROW 276 - struct IntuiMessage { uint32 _msgClass; uint16 _code; // KeyCode or Button Id @@ -61,7 +56,7 @@ struct IntuiMessage { struct Button { uint16 _x, _y, _buttonId; - uint16 _keyEquiv; // if not zero, a key that activates button + Common::KeyCode _keyEquiv; // if not zero, a key that activates button bool _isEnabled; Image *_image, *_altImage; }; @@ -95,7 +90,7 @@ private: * Checks whether or not the coords fall within one of the buttons in a list * of buttons. */ - Button *checkNumButtonHit(ButtonList *buttonList, uint16 key); + Button *checkNumButtonHit(ButtonList *buttonList, Common::KeyCode key); /** * Make a key press have the right case for a button KeyEquiv value. @@ -106,7 +101,7 @@ public: EventManager (LabEngine *vm); void attachButtonList(ButtonList *buttonList); - Button *createButton(uint16 x, uint16 y, uint16 id, uint16 key, Image *image, Image *altImage); + Button *createButton(uint16 x, uint16 y, uint16 id, Common::KeyCode key, Image *image, Image *altImage); void toggleButton(Button *button, uint16 penColor, bool enable); /** |