[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.246,1.247 scumm.h,1.508,1.509 vars.cpp,1.108,1.109

[Travis Howell]

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

Modified Files:
	scumm.cpp scumm.h vars.cpp 
Log Message:

Rename var and enable in COMI.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- scumm.cpp	4 Oct 2004 12:16:52 -0000	1.246
+++ scumm.cpp	4 Oct 2004 14:28:42 -0000	1.247
@@ -779,8 +779,8 @@
 
 	VAR_V5_TALK_STRING_Y = 0xFF;
 
-	VAR_V6_SCREEN_WIDTH = 0xFF;
-	VAR_V6_SCREEN_HEIGHT = 0xFF;
+	VAR_ROOM_WIDTH = 0xFF;
+	VAR_ROOM_HEIGHT = 0xFF;
 	VAR_V6_EMSSPACE = 0xFF;
 
 	VAR_CAMERA_POS_Y = 0xFF;
@@ -1846,9 +1846,9 @@
 		loadRoomObjects();
 
 	
-	if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
-		VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
-		VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
+	if (VAR_ROOM_WIDTH != 0xFF && VAR_ROOM_HEIGHT != 0xFF) {
+		VAR(VAR_ROOM_WIDTH) = _roomWidth;
+		VAR(VAR_ROOM_HEIGHT) = _roomHeight;
 	}
 
 	VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -d -r1.508 -r1.509
--- scumm.h	4 Oct 2004 04:04:37 -0000	1.508
+++ scumm.h	4 Oct 2004 14:28:43 -0000	1.509
@@ -1271,8 +1271,8 @@
 
 	byte VAR_V5_TALK_STRING_Y;
 
-	byte VAR_V6_SCREEN_WIDTH;
-	byte VAR_V6_SCREEN_HEIGHT;
+	byte VAR_ROOM_WIDTH;
+	byte VAR_ROOM_HEIGHT;
 	byte VAR_V6_EMSSPACE;
 
 	byte VAR_CAMERA_POS_Y;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- vars.cpp	4 Oct 2004 02:23:02 -0000	1.108
+++ vars.cpp	4 Oct 2004 14:28:43 -0000	1.109
@@ -154,8 +154,8 @@
 	// Many vars are the same as in V5 & V6 games, so just call the inherited method first
 	ScummEngine::setupScummVars();
 
-	VAR_V6_SCREEN_WIDTH = 41;
-	VAR_V6_SCREEN_HEIGHT = 54;
+	VAR_ROOM_WIDTH = 41;
+	VAR_ROOM_HEIGHT = 54;
 
 	VAR_LEFTBTN_HOLD = 74;
 	VAR_RIGHTBTN_HOLD = 75;
@@ -210,8 +210,8 @@
 	VAR_CURSORSTATE = 19;
 	VAR_USERPUT = 20;
 	VAR_ROOM = 21;
-	VAR_V6_SCREEN_WIDTH = 22;
-	VAR_V6_SCREEN_HEIGHT = 23;
+	VAR_ROOM_WIDTH = 22;
+	VAR_ROOM_HEIGHT = 23;
 	VAR_CAMERA_POS_X = 24;
 	VAR_CAMERA_MIN_X = 25;
 	VAR_CAMERA_MAX_X = 26;
@@ -278,8 +278,8 @@
 	VAR_MOUSE_Y = 2;
 	VAR_VIRT_MOUSE_X = 3;
 	VAR_VIRT_MOUSE_Y = 4;
-	VAR_V6_SCREEN_WIDTH = 5;
-	VAR_V6_SCREEN_HEIGHT = 6;
+	VAR_ROOM_WIDTH = 5;
+	VAR_ROOM_HEIGHT = 6;
 	VAR_CAMERA_POS_X = 7;
 	VAR_CAMERA_POS_Y = 8;
 	VAR_OVERRIDE = 9;
@@ -378,8 +378,8 @@
 }
 
 void ScummEngine_v8::setupScummVars() {
-	// VAR_ROOM_HEIGHT = 1;
-	// VAR_ROOM_WIDTH = 2;
+	VAR_ROOM_WIDTH = 1;
+	VAR_ROOM_HEIGHT = 2;
 
 	VAR_MOUSE_X = 3;
 	VAR_MOUSE_Y = 4;