[Scummvm-cvs-logs] CVS: scummvm/sword1 menu.cpp,1.12,1.13 mouse.cpp,1.14,1.15

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv31308/sword1

Modified Files:
	menu.cpp mouse.cpp 
Log Message:
forgot these...

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- menu.cpp	30 Dec 2003 21:32:50 -0000	1.12
+++ menu.cpp	30 Dec 2003 21:48:10 -0000	1.13
@@ -299,6 +299,7 @@
 	SwordLogic::_scriptVars[OBJECT_HELD]  = 0; // icon no longer selected
 	SwordLogic::_scriptVars[SECOND_ITEM]  = 0; // second icon no longer selected (after using one on another)
 	SwordLogic::_scriptVars[MENU_LOOKING] = 0; // no longer 'looking at' an icon
+	_mouse->setLuggage(0, 0);
 	buildMenu();
 	_mouse->controlPanel(true); // so that the arrow cursor will be shown.
 	showMenu(MENU_TOP);
@@ -313,6 +314,7 @@
 
 void SwordMenu::fnChooser(BsObject *compact) {
 	SwordLogic::_scriptVars[OBJECT_HELD] = 0;
+	_mouse->setLuggage(0, 0);
 	buildSubjects();
 	compact->o_logic = LOGIC_choose;
 	_mouse->controlPanel(true); // so the mouse cursor will be shown.
@@ -324,6 +326,7 @@
 	_subjectBarStatus = MENU_CLOSING;
 	_objectBarStatus = MENU_CLOSING;
 	_mouse->controlPanel(false);
+	_mouse->setLuggage(0, 0);
 }
 
 void SwordMenu::checkTopMenu(void) {

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mouse.cpp	30 Dec 2003 21:32:50 -0000	1.14
+++ mouse.cpp	30 Dec 2003 21:48:10 -0000	1.15
@@ -243,7 +243,7 @@
 }
 
 void SwordMouse::animate(void) {
-	if ((SwordLogic::_scriptVars[MOUSE_STATUS] == 1) || _mouseOverride) {
+	if ((SwordLogic::_scriptVars[MOUSE_STATUS] == 1) || (_mouseOverride && _currentPtr)) {
 		_frame = (_frame + 1) % _currentPtr->numFrames;
 		uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr);
 		ptrData += _frame * _currentPtr->sizeX * _currentPtr->sizeY;