[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.196,1.197 scummvm.cpp,2.156,2.157 vars.cpp,1.50,1.51 verbs.cpp,1.40,1.41

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv811/scumm

Modified Files:
	scumm.h scummvm.cpp vars.cpp verbs.cpp 
Log Message:
Cleanup


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- scumm.h	16 May 2003 16:09:16 -0000	1.196
+++ scumm.h	17 May 2003 06:14:07 -0000	1.197
@@ -1149,6 +1149,8 @@
 
 	byte VAR_CUSTOMSCALETABLE;
 	byte VAR_V6_SOUNDMODE;
+
+	byte VAR_CLICK_AREA;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.156
retrieving revision 2.157
diff -u -d -r2.156 -r2.157
--- scummvm.cpp	17 May 2003 03:06:16 -0000	2.156
+++ scummvm.cpp	17 May 2003 06:14:08 -0000	2.157
@@ -1853,9 +1853,7 @@
 			VAR(VAR_MOUSE_HOLD) += 2;
 		}
 	} else if (_features & GF_AFTER_V7) {
-//    VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed&msClicked) != 0;
 		VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
-//    VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed&msClicked) != 0;
 		VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
 	} else if (_features & GF_AFTER_V2) {
 		// Store the input type. So far we can't distinguise
@@ -1867,12 +1865,12 @@
 			VirtScreen *zone = findVirtScreen(_mouse.y);
 
 			if (zone->number == 0)		// Clicked in scene
-				_scummVars[32] = 2;
+				_scummVars[VAR_CLICK_AREA] = 2;
 			else if (zone->number == 2) 	// Clicked in verb/sentence
-				_scummVars[32] = 1;
+				_scummVars[VAR_CLICK_AREA] = 1;
 
 		} else if (_lastKeyHit) 		// Key Input
-			_scummVars[32] = 4;
+			_scummVars[VAR_CLICK_AREA] = 4;
 	}
 
 	_leftBtnPressed &= ~msClicked;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- vars.cpp	17 May 2003 06:04:22 -0000	1.50
+++ vars.cpp	17 May 2003 06:14:08 -0000	1.51
@@ -123,6 +123,7 @@
 	VAR_SENTENCE_OBJECT2 = 28;
 	VAR_VIRT_MOUSE_X = 30;
 	VAR_VIRT_MOUSE_Y = 31;
+	VAR_CLICK_AREA = 32;
 	VAR_ROOM_RESOURCE = 36;
 	VAR_LAST_SOUND = 37;
 	VAR_KEYPRESS = 39;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- verbs.cpp	15 May 2003 22:41:35 -0000	1.40
+++ verbs.cpp	17 May 2003 06:14:08 -0000	1.41
@@ -43,14 +43,6 @@
 	int i, over;
 	VerbSlot *vs;
 
-#if 1
-		// FIXME - MM / Zak hack
-		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
-			printf("Running script 4\n");
-			runScript(4, 0, 0, 0);
-		}
-#endif
-
 	if (_userPut <= 0 || _mouseButStat == 0)
 		return;
 
@@ -86,6 +78,15 @@
 			runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
 		}
 	}
+
+#if 1
+		// FIXME - MM / Zak hack
+		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
+			printf("Running script 4\n");
+			runScript(4, 0, 0, 0);
+		}
+#endif
+
 }
 
 void Scumm::verbMouseOver(int verb) {