From 1c2a9d2e122304b1f6b8ca78b96e34b2a2ed53c8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 3 Nov 2017 09:14:58 +0200
Subject: DRASCULA: characterMoved and characterVisible are boolean variables

---
 engines/drascula/actors.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'engines/drascula/actors.cpp')

diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index 3b1ac7cb60..8ab3839ebb 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -105,7 +105,7 @@ void DrasculaEngine::hiccup(int counter) {
 }
 
 void DrasculaEngine::startWalking() {
-	characterMoved = 1;
+	_characterMoved = true;
 
 	stepX = STEP_X;
 	stepY = STEP_Y;
@@ -124,7 +124,7 @@ void DrasculaEngine::startWalking() {
 		else if (roomY > curY + curHeight)
 			walkDown();
 		else
-			characterMoved = 0;
+			_characterMoved = false;
 	} else {
 		if ((roomX < curX + curWidth / 2 ) && (roomY <= (curY + curHeight)))
 			quadrant_1();
@@ -135,7 +135,7 @@ void DrasculaEngine::startWalking() {
 		else if ((roomX > curX + curWidth / 2) && (roomY > (curY + curHeight)))
 			quadrant_4();
 		else
-			characterMoved = 0;
+			_characterMoved = false;
 	}
 	_startTime = getTime();
 }
@@ -144,16 +144,16 @@ void DrasculaEngine::moveCharacters() {
 	int curPos[6];
 	int r;
 
-	if (characterMoved == 1 && stepX == STEP_X) {
+	if (_characterMoved && stepX == STEP_X) {
 		for (r = 0; r < stepX; r++) {
 			if (currentChapter != 2) {
 				if (trackProtagonist == 0 && roomX - r == curX + curWidth / 2) {
-					characterMoved = 0;
+					_characterMoved = false;
 					stepX = STEP_X;
 					stepY = STEP_Y;
 				}
 				if (trackProtagonist == 1 && roomX + r == curX + curWidth / 2) {
-					characterMoved = 0;
+					_characterMoved = false;
 					stepX = STEP_X;
 					stepY = STEP_Y;
 					curX = roomX - curWidth / 2;
@@ -161,12 +161,12 @@ void DrasculaEngine::moveCharacters() {
 				}
 			} else if (currentChapter == 2) {
 				if (trackProtagonist == 0 && roomX - r == curX) {
-					characterMoved = 0;
+					_characterMoved = false;
 					stepX = STEP_X;
 					stepY = STEP_Y;
 				}
 				if (trackProtagonist == 1 && roomX + r == curX + curWidth) {
-					characterMoved = 0;
+					_characterMoved = false;
 					stepX = STEP_X;
 					stepY = STEP_Y;
 					curX = roomX - curWidth + 4;
@@ -175,15 +175,15 @@ void DrasculaEngine::moveCharacters() {
 			}
 		}
 	}
-	if (characterMoved == 1 && stepY == STEP_Y) {
+	if (_characterMoved && stepY == STEP_Y) {
 		for (r = 0; r < stepY; r++) {
 			if (trackProtagonist == 2 && roomY - r == curY + curHeight) {
-				characterMoved = 0;
+				_characterMoved = false;
 				stepX = STEP_X;
 				stepY = STEP_Y;
 			}
 			if (trackProtagonist == 3 && roomY + r == curY + curHeight) {
-				characterMoved = 0;
+				_characterMoved = false;
 				stepX = STEP_X;
 				stepY = STEP_Y;
 			}
@@ -191,13 +191,13 @@ void DrasculaEngine::moveCharacters() {
 	}
 
 	if (currentChapter != 2 && currentChapter != 3) {
-		if (characterVisible == 0) {
+		if (!_characterVisible) {
 			increaseFrameNum();
 			return;
 		}
 	}
 
-	if (characterMoved == 0) {
+	if (!_characterMoved) {
 		curPos[0] = 0;
 		curPos[1] = DIF_MASK_HARE;
 		curPos[2] = curX;
@@ -240,7 +240,7 @@ void DrasculaEngine::moveCharacters() {
 				reduce_hare_chico(curPos[0], curPos[1], curPos[2], curPos[3], curPos[4], curPos[5],
 									factor_red[curY + curHeight], frontSurface, screenSurface);
 		}
-	} else if (characterMoved == 1) {
+	} else if (_characterMoved) {
 		curPos[0] = _frameX[_characterFrame];
 		curPos[1] = frame_y + DIF_MASK_HARE;
 		curPos[2] = curX;
-- 
cgit v1.2.3