4 files changed, 13 insertions, 3 deletions
diff --git a/engines/mohawk/cstime.cpp b/engines/mohawk/cstime.cpp
index 3f9827581b..0f69d50a22 100644
--- a/engines/mohawk/cstime.cpp
+++ b/engines/mohawk/cstime.cpp
@@ -51,6 +51,15 @@ MohawkEngine_CSTime::MohawkEngine_CSTime(OSystem *syst, const MohawkGameDescript
 	_state = kCSTStateStartup;
 
 	reset();
+
+	_console = 0;
+	_gfx = 0;
+	_cursor = 0;
+	_interface = 0;
+	_view = 0;
+	_needsUpdate = false;
+	_case = 0;
+	_nextSceneId = 1;
 }
 
 MohawkEngine_CSTime::~MohawkEngine_CSTime() {
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 {