[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.153,1.154 gfx.cpp,2.464,2.465 script_c64.cpp,2.11,2.12 script_v2.cpp,2.280,2.281 script_v5.cpp,1.291,1.292 script_v6.cpp,1.447,1.448 script_v7he.cpp,2.165,2.166 script_v90he.cpp,2.278,2.279

[Torbjörn Andersson]

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

Modified Files:
	debugger.cpp gfx.cpp script_c64.cpp script_v2.cpp 
	script_v5.cpp script_v6.cpp script_v7he.cpp script_v90he.cpp 
Log Message:
Cleanup.


Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- debugger.cpp	30 Jul 2005 21:11:23 -0000	1.153
+++ debugger.cpp	6 Aug 2005 14:34:39 -0000	1.154
@@ -205,7 +205,7 @@
 		_vm->_actors[_vm->VAR(_vm->VAR_EGO)]._room = room;
 		_vm->_sound->stopAllSounds();
 		_vm->startScene(room, 0, 0);
-		_vm->_fullRedraw = 1;
+		_vm->_fullRedraw = true;
 		return false;
 	} else {
 		DebugPrintf("Current room: %d [%d] - use 'room <roomnum>' to switch\n", _vm->_currentRoom, _vm->_roomResource);
@@ -397,21 +397,21 @@
 	} else if (!strcmp(argv[2], "x")) {
 		a->putActor(value, a->_pos.y, a->_room);
 		DebugPrintf("Actor[%d].x = %d\n", actnum, a->_pos.x);
-		_vm->_fullRedraw = 1;
+		_vm->_fullRedraw = true;
 	} else if (!strcmp(argv[2], "y")) {
 		a->putActor(a->_pos.x, value, a->_room);
 		DebugPrintf("Actor[%d].y = %d\n", actnum, a->_pos.y);
-		_vm->_fullRedraw = 1;
+		_vm->_fullRedraw = true;
 	} else if (!strcmp(argv[2], "_elevation")) {
 		a->setElevation(value);
 		DebugPrintf("Actor[%d]._elevation = %d\n", actnum, a->getElevation());
-		_vm->_fullRedraw = 1;
+		_vm->_fullRedraw = true;
 	} else if (!strcmp(argv[2], "costume")) {
 		if (value >= _vm->res.num[rtCostume])
 			DebugPrintf("Costume not changed as %d exceeds max of %d\n", value, _vm->res.num[rtCostume]);
 		else {
 			a->setActorCostume(value);
-			_vm->_fullRedraw = 1;
+			_vm->_fullRedraw = true;
 			DebugPrintf("Actor[%d].costume = %d\n", actnum, a->_costume);
 		}
 	} else if (!strcmp(argv[2], "name")) {

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.464
retrieving revision 2.465
diff -u -d -r2.464 -r2.465
--- gfx.cpp	30 Jul 2005 21:11:24 -0000	2.464
+++ gfx.cpp	6 Aug 2005 14:34:39 -0000	2.465
@@ -772,24 +772,24 @@
 
 	if (_features & GF_NEW_CAMERA) {
 		diff = camera._cur.x / 8 - camera._last.x / 8;
-		if (_fullRedraw == 0 && diff == 1) {
+		if (!_fullRedraw && diff == 1) {
 			val = 2;
 			redrawBGStrip(gdi._numStrips - 1, 1);
-		} else if (_fullRedraw == 0 && diff == -1) {
+		} else if (!_fullRedraw && diff == -1) {
 			val = 1;
 			redrawBGStrip(0, 1);
-		} else if (_fullRedraw != 0 || diff != 0) {
+		} else if (_fullRedraw || diff != 0) {
 			_bgNeedsRedraw = false;
 			redrawBGStrip(0, gdi._numStrips);
 		}
 	} else {
-		if (_fullRedraw == 0 && camera._cur.x - camera._last.x == 8) {
+		if (!_fullRedraw && camera._cur.x - camera._last.x == 8) {
 			val = 2;
 			redrawBGStrip(gdi._numStrips - 1, 1);
-		} else if (_fullRedraw == 0 && camera._cur.x - camera._last.x == -8) {
+		} else if (!_fullRedraw && camera._cur.x - camera._last.x == -8) {
 			val = 1;
 			redrawBGStrip(0, 1);
-		} else if (_fullRedraw != 0 || camera._cur.x != camera._last.x) {
+		} else if (_fullRedraw || camera._cur.x != camera._last.x) {
 			_bgNeedsRedraw = false;
 			_flashlight.isDrawn = false;
 			redrawBGStrip(0, gdi._numStrips);

Index: script_c64.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_c64.cpp,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- script_c64.cpp	30 Jul 2005 21:11:27 -0000	2.11
+++ script_c64.cpp	6 Aug 2005 14:34:39 -0000	2.12
@@ -563,7 +563,7 @@
 	else
 		VAR(VAR_CURRENT_LIGHTS) = 0;
 
-	_fullRedraw = 1;
+	_fullRedraw = true;
 }
 
 void ScummEngine_c64::o_getObjectOwner() {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.280
retrieving revision 2.281
diff -u -d -r2.280 -r2.281
--- script_v2.cpp	30 Jul 2005 21:11:28 -0000	2.280
+++ script_v2.cpp	6 Aug 2005 14:34:39 -0000	2.281
@@ -1318,7 +1318,7 @@
 		_flashlight.xStrips = a;
 		_flashlight.yStrips = b;
 	}
-	_fullRedraw = 1;
+	_fullRedraw = true;
 }
 
 void ScummEngine_v2::o2_loadRoomWithEgo() {
@@ -1346,7 +1346,7 @@
 	setCameraAt(a->_pos.x, a->_pos.y);
 	setCameraFollows(a);
 
-	_fullRedraw = 1;
+	_fullRedraw = true;
 
 	resetSentence();
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- script_v5.cpp	30 Jul 2005 21:11:28 -0000	1.291
+++ script_v5.cpp	6 Aug 2005 14:34:40 -0000	1.292
@@ -1470,7 +1470,7 @@
 		_flashlight.xStrips = a;
 		_flashlight.yStrips = b;
 	}
-	_fullRedraw = 1;
+	_fullRedraw = true;
 }
 
 void ScummEngine_v5::o5_loadRoom() {
@@ -1492,7 +1492,7 @@
 	if (!(_features & GF_SMALL_HEADER) || room != _currentRoom)
 		startScene(room, 0, 0);
 
-	_fullRedraw = 1;
+	_fullRedraw = true;
 }
 
 void ScummEngine_v5::o5_loadRoomWithEgo() {
@@ -1532,7 +1532,7 @@
 	camera._cur.x = camera._dest.x = a->_pos.x;
 	setCameraFollows(a);
 
-	_fullRedraw = 1;
+	_fullRedraw = true;
 
 	if (x != -1) {
 		a->startWalkActor(x, y, -1);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- script_v6.cpp	30 Jul 2005 21:11:28 -0000	1.447
+++ script_v6.cpp	6 Aug 2005 14:34:40 -0000	1.448
@@ -1149,7 +1149,7 @@
 	if (_heversion >= 61) {
 		setCameraAt(camera._cur.x, 0);
 	}
-	_fullRedraw = 1;
+	_fullRedraw = true;
 }
 
 void ScummEngine_v6::o6_stopScript() {
@@ -1336,7 +1336,7 @@
 		setCameraFollows(a);
 	}
 
-	_fullRedraw = 1;
+	_fullRedraw = true;
 
 	if (x != -1 && x != 0x7FFFFFFF) {
 		a->startWalkActor(x, y, -1);
@@ -2588,7 +2588,7 @@
 			fadeOut(args[1]);
 			break;
 		case 6:
-			_fullRedraw = 1;
+			_fullRedraw = true;
 			redrawBGAreas();
 			setActorRedrawFlags();
 			processActors();

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- script_v7he.cpp	30 Jul 2005 21:11:29 -0000	2.165
+++ script_v7he.cpp	6 Aug 2005 14:34:40 -0000	2.166
@@ -800,7 +800,7 @@
 		break;
 	case 23:
 		_charset->clearCharsetMask();
-		_fullRedraw = 1;
+		_fullRedraw = true;
 		break;
 	case 24:
 		_skipProcessActors = 1;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.278
retrieving revision 2.279
diff -u -d -r2.278 -r2.279
--- script_v90he.cpp	30 Jul 2005 21:11:29 -0000	2.278
+++ script_v90he.cpp	6 Aug 2005 14:34:40 -0000	2.279
@@ -2599,7 +2599,7 @@
 		break;
 	case 23:
 		_charset->clearCharsetMask();
-		_fullRedraw = 1;
+		_fullRedraw = true;
 		break;
 	case 24:
 		_skipProcessActors = 1;