diff options
-rw-r--r-- | engines/hopkins/dialogs.cpp | 2 | ||||
-rw-r--r-- | engines/hopkins/events.h | 4 | ||||
-rw-r--r-- | engines/hopkins/hopkins.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index 742946e2cb..9285ae6a81 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -527,7 +527,7 @@ void DialogsManager::TestForDialogOpening() { if (_vm->_eventsManager.GAME_KEY != KEY_NONE) { if (!INVENTFLAG) { - GAME_KEY key = _vm->_eventsManager.GAME_KEY; + DIALOG_KEY key = _vm->_eventsManager.GAME_KEY; _vm->_eventsManager.GAME_KEY = KEY_NONE; INVENTFLAG = 1; diff --git a/engines/hopkins/events.h b/engines/hopkins/events.h index 7979115a0f..364a74fcf8 100644 --- a/engines/hopkins/events.h +++ b/engines/hopkins/events.h @@ -34,7 +34,7 @@ namespace Hopkins { class HopkinsEngine; -enum GAME_KEY { KEY_NONE = 0, KEY_INVENTORY = 1, KEY_OPTIONS = 2, KEY_SAVE = 3, KEY_LOAD = 4 }; +enum DIALOG_KEY { KEY_NONE = 0, KEY_INVENTORY = 1, KEY_OPTIONS = 2, KEY_SAVE = 3, KEY_LOAD = 4 }; class EventsManager { private: @@ -62,7 +62,7 @@ public: uint32 _priorFrameTime; bool ESC_KEY; bool NOESC; - GAME_KEY GAME_KEY; + DIALOG_KEY GAME_KEY; int btsouris; public: EventsManager(); diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h index 706a4efda7..1399a80498 100644 --- a/engines/hopkins/hopkins.h +++ b/engines/hopkins/hopkins.h @@ -119,7 +119,7 @@ public: uint32 getFeatures() const; Common::Language getLanguage() const; - Common::Platform HopkinsEngine::getPlatform() const; + Common::Platform getPlatform() const; uint16 getVersion() const; bool getIsDemo() const; bool shouldQuit() const; |