[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.50,1.51 interface.h,1.19,1.20 sfuncs.cpp,1.68,1.69

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18615

Modified Files:
	interface.cpp interface.h sfuncs.cpp 
Log Message:
Fix actor walking caused by wrong panel state


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- interface.cpp	6 Jan 2005 14:02:52 -0000	1.50
+++ interface.cpp	6 Jan 2005 14:49:47 -0000	1.51
@@ -278,8 +278,10 @@
 
 	if (_panelMode == kPanelConverse)
 		_inMainMode = false;
-	//else if (_panelMode == kPanelInventory)
-	//	_inMainMode = true;
+	else if (_panelMode == kPanelInventory) {
+		_inMainMode = true;
+		_panelMode = kPanelMain;
+	}
 
 	draw();
 
@@ -398,7 +400,7 @@
 	// 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

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- interface.h	6 Jan 2005 14:02:53 -0000	1.19
+++ interface.h	6 Jan 2005 14:49:47 -0000	1.20
@@ -112,7 +112,8 @@
 	kPanelConverse,
 	kPanelProtect,
 	kPanelPlacard,
-	kPanelMap
+	kPanelMap,
+	kPanelInventory
 };
 
 enum BUTTON_FLAGS {

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sfuncs.cpp	6 Jan 2005 14:04:09 -0000	1.68
+++ sfuncs.cpp	6 Jan 2005 14:49:47 -0000	1.69
@@ -196,7 +196,7 @@
 	; // center actor
 	; // show verb
 	_vm->_interface->activate();
-	//_vm->_interface->setMode(kPanelInventory);
+	_vm->_interface->setMode(kPanelInventory);
 	; // set pointer verb
 
 	return SUCCESS;