[Scummvm-cvs-logs] SF.net SVN: scummvm:[42880] scummvm/trunk/engines/scumm/verbs.cpp

[fingolfin at users.sourceforge.net]

Revision: 42880
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42880&view=rev
Author:   fingolfin
Date:     2009-07-29 08:55:04 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
SCUMM: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/verbs.cpp

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2009-07-29 08:08:04 UTC (rev 42879)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2009-07-29 08:55:04 UTC (rev 42880)
@@ -377,7 +377,7 @@
 
 	if (object > 0) {
 		if (_game.version == 0) {
-				_activeInventory = object;
+			_activeInventory = object;
 
 		} else {
 			runInputScript(kInventoryClickArea, object, 0);
@@ -626,14 +626,14 @@
 			if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) {
 				if (_mouseAndKeyboardStat == vs->key) {
 					// Trigger verb as if the user clicked it
-					runInputScript(1, vs->verbid, 1);
+					runInputScript(kVerbClickArea, vs->verbid, 1);
 					return;
 				}
 			}
 		}
 
 		// Generic keyboard input
-		runInputScript(4, _mouseAndKeyboardStat, 1);
+		runInputScript(kKeyClickArea, _mouseAndKeyboardStat, 1);
 	} else if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
 		VirtScreen *zone = findVirtScreen(_mouse.y);
 		const byte code = _mouseAndKeyboardStat & MBS_LEFT_CLICK ? 1 : 2;
@@ -646,7 +646,7 @@
 
 		if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 			// Click into V2 sentence line
-			runInputScript(5, 0, 0);
+			runInputScript(kSentenceClickArea, 0, 0);
 		} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + inventoryArea) {
 			// Click into V2 inventory
 			checkV2Inventory(_mouse.x, _mouse.y);
@@ -654,7 +654,7 @@
 			over = findVerbAtPos(_mouse.x, _mouse.y);
 			if (over != 0) {
 				// Verb was clicked
-				runInputScript(1, _verbs[over].verbid, code);
+				runInputScript(kVerbClickArea, _verbs[over].verbid, code);
 			} else {
 				// Scene was clicked
 				runInputScript((zone->number == kMainVirtScreen) ? kSceneClickArea : kVerbClickArea, 0, code);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.