From 246edc82e6f5fb394df40aa2a2060aa7f168ae11 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 30 Sep 2013 10:04:22 +0300 Subject: MOHAWK: Fix compiler warning --- engines/mohawk/cstime_game.cpp | 2 +- engines/mohawk/cstime_ui.cpp | 2 +- engines/mohawk/cstime_ui.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp index 2e21111025..91d2f895c0 100644 --- a/engines/mohawk/cstime_game.cpp +++ b/engines/mohawk/cstime_game.cpp @@ -1094,7 +1094,7 @@ void CSTimeScene::idleAmbientAnims() { bool CSTimeScene::eventIsActive() { return _vm->NISIsRunning() /* TODO || _vm->soundIsPlaying()*/ || _vm->getCurrentEventType() == kCSTimeEventWaitForClick - || _activeChar->_flappingState != 0xffff || _vm->getInterface()->getState() == 4; + || _activeChar->_flappingState != 0xffff || _vm->getInterface()->getState() == kCSTimeInterfaceDroppedInventory; } void CSTimeScene::cursorOverHotspot(uint id) { diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp index de7d5bde80..6d5e5dd3ef 100644 --- a/engines/mohawk/cstime_ui.cpp +++ b/engines/mohawk/cstime_ui.cpp @@ -854,7 +854,7 @@ void CSTimeInterface::dropItemInInventory(uint16 id) { clearDialogArea(); _inventoryDisplay->show(); _inventoryDisplay->draw(); - _inventoryDisplay->setState(4); + _inventoryDisplay->setState(kCSTimeInterfaceDroppedInventory); } CSTimeHelp::CSTimeHelp(MohawkEngine_CSTime *vm) : _vm(vm) { diff --git a/engines/mohawk/cstime_ui.h b/engines/mohawk/cstime_ui.h index 27df7cac3e..3154d4b2ef 100644 --- a/engines/mohawk/cstime_ui.h +++ b/engines/mohawk/cstime_ui.h @@ -167,7 +167,8 @@ protected: enum CSTimeInterfaceState { kCSTimeInterfaceStateNormal = 1, kCSTimeInterfaceStateDragStart = 2, - kCSTimeInterfaceStateDragging = 3 + kCSTimeInterfaceStateDragging = 3, + kCSTimeInterfaceDroppedInventory = 4 }; class CSTimeInterface { -- cgit v1.2.3