cleanup

svn-id: r17873

3 files changed, 10 insertions, 8 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 13431ab839..741361a988 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -273,9 +273,9 @@ void ScummEngine::initScreens(int b, int h) {
 	}
 
 	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);
 	}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 3619cdc8ce..d5fad5ca20 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -729,6 +729,10 @@ protected:
 	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 @@ public:
 	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:
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 98482cb6d2..014a773c15 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -415,10 +415,10 @@ void ScummEngine::checkExecVerbs() {
 		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 @@ void ScummEngine::checkExecVerbs() {
 				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);
 			}
 		}
 	}