[Scummvm-cvs-logs] CVS: scummvm/sword2 mouse.cpp,1.41,1.42 mouse.h,1.9,1.10 sword2.h,1.38,1.39

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv18500

Modified Files:
	mouse.cpp mouse.h sword2.h 
Log Message:
cleanup


Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- mouse.cpp	11 Nov 2003 07:43:02 -0000	1.41
+++ mouse.cpp	12 Nov 2003 08:21:17 -0000	1.42
@@ -59,8 +59,11 @@
 	USE		= 3100
 };
 
+/**
+ * Call at beginning of game loop
+ */
+
 void Sword2Engine::resetMouseList(void) {
-	// call at beginning of gameloop
 	_curMouse = 1;
 }
[...1257 lines suppressed...]
-		_mouseList[_curMouse].anim_pc = 0;
+	// Not using sprite as mask - this is only done from fnRegisterFrame()
 
-		debug(5, "mouse id %d", _mouseList[_curMouse].id);
-		_curMouse++;
-	}
+	_mouseList[_curMouse].anim_resource = 0;
+	_mouseList[_curMouse].anim_pc = 0;
+
+	debug(5, "mouse id %d", _mouseList[_curMouse].id);
+	_curMouse++;
 }
 
 void Sword2Engine::monitorPlayerActivity(void) {
 	// if there is at least one mouse event outstanding
-	if (g_input->checkForMouseEvents()) {
+	if (_input->checkForMouseEvents()) {
 		// reset activity delay counter
 		_playerActivityDelay = 0;
 	} else {

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mouse.h	2 Nov 2003 18:50:06 -0000	1.9
+++ mouse.h	12 Nov 2003 08:21:18 -0000	1.10
@@ -31,9 +31,12 @@
 	MOUSE_menu		= 1,	// menu chooser
 	MOUSE_drag		= 2,	// dragging luggage
 	MOUSE_system_menu	= 3,	// system menu chooser
-	MOUSE_holding		= 4	// speech chooser
+	MOUSE_holding		= 4	// special
 };
 
+// The MOUSE_holding mode is entered when the conversation menu is closed, and
+// exited when the mouse cursor moves off that menu area. I don't know why yet.
+ 
 // mouse unit - like Object_mouse, but with anim resource & pc (needed if
 // sprite is to act as mouse detection mask)
 

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- sword2.h	11 Nov 2003 10:30:21 -0000	1.38
+++ sword2.h	12 Nov 2003 08:21:18 -0000	1.39
@@ -126,6 +126,8 @@
 	void startNewPalette(void);
 	void processLayer(uint32 layer_number);
 
+	int menuClick(int menu_items);
+
 	void getPlayerStructures(void);
 	void putPlayerStructures(void);