[Scummvm-cvs-logs] CVS: scummvm/scumm verbs.cpp,1.134,1.135 scumm.h,1.612,1.613 gfx.cpp,2.443,2.444

Max Horn fingolfin at users.sourceforge.net
Sat Apr 30 08:04:47 CEST 2005


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

Modified Files:
	verbs.cpp scumm.h gfx.cpp 
Log Message:
cleanup

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- verbs.cpp	28 Apr 2005 01:04:42 -0000	1.134
+++ verbs.cpp	30 Apr 2005 15:04:15 -0000	1.135
@@ -415,10 +415,10 @@
 		byte code = _mouseAndKeyboardStat & MBS_LEFT_CLICK ? 1 : 2;
 		int inventoryArea = (_platform == Common::kPlatformNES) ? 48: 32;
 
-		if (_version <= 2 && zone->number == 2 && _mouse.y <= zone->topline + 8) {
+		if (_version <= 2 && zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 			// Click into V2 sentence line
 			runInputScript(5, 0, 0);
-		} else if (_version <= 2 && zone->number == 2 && _mouse.y > zone->topline + inventoryArea) {
+		} else if (_version <= 2 && zone->number == kVerbVirtScreen && _mouse.y > zone->topline + inventoryArea) {
 			// Click into V2 inventory
 			((ScummEngine_v2 *)this)->checkV2Inventory(_mouse.x, _mouse.y);
 		} else {
@@ -428,7 +428,7 @@
 				runInputScript(1, _verbs[over].verbid, code);
 			} else {
 				// Scene was clicked
-				runInputScript((zone->number == 0) ? 2 : 1, 0, code);
+				runInputScript((zone->number == kMainVirtScreen) ? 2 : 1, 0, code);
 			}
 		}
 	}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -d -r1.612 -r1.613
--- scumm.h	29 Apr 2005 15:08:31 -0000	1.612
+++ scumm.h	30 Apr 2005 15:04:16 -0000	1.613
@@ -729,6 +729,10 @@
 	byte *_objectOwnerTable, *_objectRoomTable, *_objectStateTable;
 	int _numObjectsInRoom;
 
+public:
+	uint32 *_classData;
+
+protected:
 	virtual void setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL);
 	void markObjectRectAsDirty(int obj);
 	void loadFlObject(uint object, uint room);
@@ -808,8 +812,6 @@
 	Actor *derefActor(int id, const char *errmsg = 0) const;
 	Actor *derefActorSafe(int id, const char *errmsg) const;
 
-	uint32 *_classData;
-
 	int getAngleFromPos(int x, int y) const;
 
 protected:

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.443
retrieving revision 2.444
diff -u -d -r2.443 -r2.444
--- gfx.cpp	29 Apr 2005 06:36:03 -0000	2.443
+++ gfx.cpp	30 Apr 2005 15:04:16 -0000	2.444
@@ -273,9 +273,9 @@
 	}
 
 	if ((_platform == Common::kPlatformNES) && (h != _screenHeight)) {
-		// It is a hack to shift whole screen downwards to match original.
-		// Otherwise we will need to do lots of coordinate adjustments all over
-		// the code
+		// This is a hack to shift the whole screen downwards to match the original.
+		// Otherwise we would have to do lots of coordinate adjustments all over
+		// the code.
 		adj = 16;
 		initVirtScreen(kUnkVirtScreen, 0, _screenWidth, adj, false, false);
 	}





More information about the Scummvm-git-logs mailing list