From 028a8e4302f9e2895166e5984d1b481639bb1413 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 6 Jan 2005 14:49:47 +0000
Subject: Fix actor walking caused by wrong panel state

svn-id: r16446
---
 saga/interface.cpp | 8 +++++---
 saga/interface.h   | 3 ++-
 saga/sfuncs.cpp    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/saga/interface.cpp b/saga/interface.cpp
index abcc2593b4..943b28e151 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -278,8 +278,10 @@ int Interface::setMode(int mode) {
 
 	if (_panelMode == kPanelConverse)
 		_inMainMode = false;
-	//else if (_panelMode == kPanelInventory)
-	//	_inMainMode = true;
+	else if (_panelMode == kPanelInventory) {
+		_inMainMode = true;
+		_panelMode = kPanelMain;
+	}
 
 	draw();
 
@@ -398,7 +400,7 @@ int Interface::update(const Point& imousePt, int update_flag) {
 	// Get game display info
 	_vm->getDisplayInfo(&g_di);
 
-	if (_panelMode == kPanelMain) {
+	if (_panelMode == kPanelMain) { // FIXME: HACK
 		// Update playfield space ( only if cursor is inside )
 		if (imouse_y < g_di.scene_h) {
 			// Mouse is in playfield space
diff --git a/saga/interface.h b/saga/interface.h
index 58a007b3ac..9e2aa382c3 100644
--- a/saga/interface.h
+++ b/saga/interface.h
@@ -112,7 +112,8 @@ enum PANEL_MODES {
 	kPanelConverse,
 	kPanelProtect,
 	kPanelPlacard,
-	kPanelMap
+	kPanelMap,
+	kPanelInventory
 };
 
 enum BUTTON_FLAGS {
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index 42324cb990..acb94eac94 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -196,7 +196,7 @@ int Script::SF_mainMode(SCRIPTFUNC_PARAMS) {
 	; // center actor
 	; // show verb
 	_vm->_interface->activate();
-	//_vm->_interface->setMode(kPanelInventory);
+	_vm->_interface->setMode(kPanelInventory);
 	; // set pointer verb
 
 	return SUCCESS;
-- 
cgit v1.2.3