[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.52,1.53 scene.h,1.32,1.33

[Eugene Sandulenko]

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

Modified Files:
	interface.cpp scene.h 
Log Message:
o Last fixes for panels. Now they work like in original.
o Code formatting in scene.h


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- interface.cpp	7 Jan 2005 00:57:43 -0000	1.52
+++ interface.cpp	7 Jan 2005 21:13:26 -0000	1.53
@@ -303,9 +303,9 @@
 	// TODO: Is this where we should hide/show the mouse cursor?
 	int newmode = mode;
 
-	if (_panelMode == kPanelConverse)
+	if (mode == kPanelConverse)
 		_inMainMode = false;
-	else if (_panelMode == kPanelInventory) {
+	else if (mode == kPanelInventory) {
 		_inMainMode = true;
 		newmode = kPanelMain;
 	}
@@ -366,9 +366,8 @@
 
 	back_buf = _vm->_gfx->getBackBuffer();
 
-	if (!_active) {
+	if (_vm->_scene->isInDemo() || _panelMode == kPanelFade)
 		return SUCCESS;
-	}
 
 	// Get game display info
 	_vm->getDisplayInfo(&g_di);
@@ -424,9 +423,8 @@
 
 	int imouse_x, imouse_y;
 
-	if (!_active) {
+	if (_vm->_scene->isInDemo() || _panelMode == kPanelFade)
 		return SUCCESS;
-	}
 
 	imouse_x = imousePt.x;
 	imouse_y = imousePt.y;

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- scene.h	6 Jan 2005 14:02:53 -0000	1.32
+++ scene.h	7 Jan 2005 21:13:26 -0000	1.33
@@ -237,9 +237,7 @@
 	bool isInDemo() { return !_inGame; }
 	
 	void getBGMaskInfo(int &width, int &height, byte *&buffer, size_t &bufferLength);
-	int isBGMaskPresent() {
-		return _bgMask.loaded;
-	}
+	int isBGMaskPresent() { return _bgMask.loaded; }
 	int getBGMaskType(const Point &testPoint);
 	bool validBGMaskPoint(const Point &testPoint);
 	bool canWalk(const Point &testPoint);