Merge branch 'master' into zvision

Conflicts:
	video/avi_decoder.cpp

13 files changed, 200 insertions, 209 deletions

diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index 9d5d6550fa..e0983809fa 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -135,7 +135,7 @@ void DrasculaEngine::startWalking() {
 		else
 			characterMoved = 0;
 	}
-	startTime = getTime();
+	_startTime = getTime();
 }
 
 void DrasculaEngine::moveCharacters() {
@@ -239,7 +239,7 @@ void DrasculaEngine::moveCharacters() {
 									factor_red[curY + curHeight], frontSurface, screenSurface);
 		}
 	} else if (characterMoved == 1) {
-		curPos[0] = _frameX[num_frame];
+		curPos[0] = _frameX[_characterFrame];
 		curPos[1] = frame_y + DIF_MASK_HARE;
 		curPos[2] = curX;
 		curPos[3] = curY;
@@ -369,13 +369,11 @@ void DrasculaEngine::quadrant_4() {
 }
 
 void DrasculaEngine::increaseFrameNum() {
-	timeDiff = getTime() - startTime;
-
-	if (timeDiff >= 6) {
-		startTime = getTime();
-		num_frame++;
-		if (num_frame == 6)
-			num_frame = 0;
+	if (getTime() - _startTime >= 6) {
+		_startTime = getTime();
+		_characterFrame++;
+		if (_characterFrame == 6)
+			_characterFrame = 0;
 
 		if (curDirection == kDirectionUp) {
 			curX -= stepX;
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 52cab6cd32..1145c8c3ff 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -426,7 +426,7 @@ void DrasculaEngine::animation_2_1() {
 		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
 			break;
 
-		roomNumber = 16;
+		_roomNumber = 16;
 
 		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
 			break;
@@ -512,7 +512,7 @@ void DrasculaEngine::animation_2_1() {
 		// room number to -1 for the same purpose
 		// Also check animation_9_6(), where the same hack was used by
 		// the original
-		roomNumber = -1;
+		_roomNumber = -1;
 		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
 			break;
 		pause(8);
@@ -734,7 +734,7 @@ void DrasculaEngine::animation_14_2() {
 
 void DrasculaEngine::asco() {
 	loadPic(roomDisk, drawSurface3);
-	loadPic(roomNumber, bgSurface, HALF_PAL);
+	loadPic(_roomNumber, bgSurface, HALF_PAL);
 	black();
 	updateRoom();
 	updateScreen();
@@ -1661,7 +1661,7 @@ void DrasculaEngine::animation_9_6() {
 	// We set the room number to -1 for the same purpose.
 	// Also check animation_2_1(), where the same hack was used
 	// by the original
-	roomNumber = -2;
+	_roomNumber = -2;
 	loadPic("nota2.alg", bgSurface, HALF_PAL);
 	black();
 	trackProtagonist = 1;
@@ -2176,9 +2176,9 @@ void DrasculaEngine::animation_5_4(){
 void DrasculaEngine::animation_6_4() {
 	debug(4, "animation_6_4()");
 
-	int prevRoom = roomNumber;
+	int prevRoom = _roomNumber;
 
-	roomNumber = 26;
+	_roomNumber = 26;
 	clearRoom();
 	loadPic(26, bgSurface, HALF_PAL);
 	loadPic("aux26.alg", drawSurface3);
@@ -2191,11 +2191,11 @@ void DrasculaEngine::animation_6_4() {
 	updateScreen();
 	pause(40);
 	talk_igor(26, kIgorFront);
-	roomNumber = prevRoom;
+	_roomNumber = prevRoom;
 	clearRoom();
 	loadPic(96, frontSurface);
 	loadPic(roomDisk, drawSurface3);
-	loadPic(roomNumber, bgSurface, HALF_PAL);
+	loadPic(_roomNumber, bgSurface, HALF_PAL);
 	selectVerb(kVerbNone);
 	updateRoom();
 }
@@ -2224,7 +2224,7 @@ void DrasculaEngine::activatePendulum() {
 
 	flags[1] = 2;
 	hare_se_ve = 0;
-	roomNumber = 102;
+	_roomNumber = 102;
 	loadPic(102, bgSurface, HALF_PAL);
 	loadPic("an_p1.alg", drawSurface3);
 	loadPic("an_p2.alg", extraSurface);
diff --git a/engines/drascula/console.cpp b/engines/drascula/console.cpp
index 426b2ade67..c0d2748ec3 100644
--- a/engines/drascula/console.cpp
+++ b/engines/drascula/console.cpp
@@ -41,7 +41,7 @@ bool Console::Cmd_Room(int argc, const char **argv) {
 
 	int roomNum = atoi(argv[1]);
 
-	_vm->loadedDifferentChapter = 0;
+	_vm->_loadedDifferentChapter = false;
 	_vm->enterRoom(roomNum);
 	_vm->selectVerb(kVerbNone);
 	_vm->clearRoom();
diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp
index d045d683fc..95a5f7d87f 100644
--- a/engines/drascula/converse.cpp
+++ b/engines/drascula/converse.cpp
@@ -216,7 +216,7 @@ void DrasculaEngine::converse(int index) {
 		phrase3_bottom = phrase2_bottom + 8 * print_abc_opc(phrase3, phrase2_bottom + 2, game3);
 		phrase4_bottom = phrase3_bottom + 8 * print_abc_opc(phrase4, phrase3_bottom + 2, kDialogOptionUnselected);
 
-		if (mouseY > 0 && mouseY < phrase1_bottom) {
+		if (_mouseY > 0 && _mouseY < phrase1_bottom) {
 			if (game1 == kDialogOptionClicked && _color != kColorWhite)
 				color_abc(kColorWhite);
 			else if (game1 != kDialogOptionClicked && _color != kColorLightGreen)
@@ -224,13 +224,13 @@ void DrasculaEngine::converse(int index) {
 
 			print_abc_opc(phrase1, 2, kDialogOptionSelected);
 
-			if (leftMouseButton == 1) {
+			if (_leftMouseButton == 1) {
 				delay(100);
 				game1 = kDialogOptionClicked;
 				talk(phrase1, sound1);
 				response(answer1);
 			}
-		} else if (mouseY > phrase1_bottom && mouseY < phrase2_bottom) {
+		} else if (_mouseY > phrase1_bottom && _mouseY < phrase2_bottom) {
 			if (game2 == kDialogOptionClicked && _color != kColorWhite)
 				color_abc(kColorWhite);
 			else if (game2 != kDialogOptionClicked && _color != kColorLightGreen)
@@ -238,13 +238,13 @@ void DrasculaEngine::converse(int index) {
 
 			print_abc_opc(phrase2, phrase1_bottom + 2, kDialogOptionSelected);
 
-			if (leftMouseButton == 1) {
+			if (_leftMouseButton == 1) {
 				delay(100);
 				game2 = kDialogOptionClicked;
 				talk(phrase2, sound2);
 				response(answer2);
 			}
-		} else if (mouseY > phrase2_bottom && mouseY < phrase3_bottom) {
+		} else if (_mouseY > phrase2_bottom && _mouseY < phrase3_bottom) {
 			if (game3 == kDialogOptionClicked && _color != kColorWhite)
 				color_abc(kColorWhite);
 			else if (game3 != kDialogOptionClicked && _color != kColorLightGreen)
@@ -252,16 +252,16 @@ void DrasculaEngine::converse(int index) {
 
 			print_abc_opc(phrase3, phrase2_bottom + 2, kDialogOptionSelected);
 
-			if (leftMouseButton == 1) {
+			if (_leftMouseButton == 1) {
 				delay(100);
 				game3 = kDialogOptionClicked;
 				talk(phrase3, sound3);
 				response(answer3);
 			}
-		} else if (mouseY > phrase3_bottom && mouseY < phrase4_bottom) {
+		} else if (_mouseY > phrase3_bottom && _mouseY < phrase4_bottom) {
 			print_abc_opc(phrase4, phrase3_bottom + 2, kDialogOptionSelected);
 
-			if (leftMouseButton == 1) {
+			if (_leftMouseButton == 1) {
 				delay(100);
 				talk(phrase4, sound4);
 				breakOut = 1;
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 804881cf9a..cde00baa32 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -91,10 +91,10 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 
 	_color = 0;
 	blinking = 0;
-	mouseX = 0;
-	mouseY = 0;
-	leftMouseButton = 0;
-	rightMouseButton = 0;
+	_mouseX = 0;
+	_mouseY = 0;
+	_leftMouseButton = 0;
+	_rightMouseButton = 0;
 	*textName = 0;
 
 	_rnd = new Common::RandomSource("drascula");
@@ -197,7 +197,7 @@ Common::Error DrasculaEngine::run() {
 	syncSoundSettings();
 
 	currentChapter = 1; // values from 1 to 6 will start each part of game
-	loadedDifferentChapter = 0;
+	_loadedDifferentChapter = false;
 	setTotalPlayTime(0);
 
 	// Check if a save is loaded from the launcher
@@ -218,7 +218,7 @@ Common::Error DrasculaEngine::run() {
 		curX = -1;
 		characterMoved = 0;
 		trackProtagonist = 3;
-		num_frame = 0;
+		_characterFrame = 0;
 		hare_se_ve = 1;
 		checkFlags = 1;
 		doBreak = 0;
@@ -231,9 +231,6 @@ Common::Error DrasculaEngine::run() {
 		curWidth = CHARACTER_WIDTH;
 		feetHeight = FEET_HEIGHT;
 
-		talkHeight = TALK_HEIGHT;
-		talkWidth = TALK_WIDTH;
-
 		hasAnswer = 0;
 		savedTime = 0;
 		breakOut = 0;
@@ -246,7 +243,7 @@ Common::Error DrasculaEngine::run() {
 		globalSpeed = 0;
 		curExcuseLook = 0;
 		curExcuseAction = 0;
-		roomNumber = 0;
+		_roomNumber = 0;
 
 		for (i = 0; i < 8; i++)
 			actorFrames[i] = 0;
@@ -268,7 +265,7 @@ Common::Error DrasculaEngine::run() {
 			loadPic("aux13.alg", bgSurface, COMPLETE_PAL);
 			loadPic(96, frontSurface);
 		} else if (currentChapter == 4) {
-			if (loadedDifferentChapter == 0)
+			if (!_loadedDifferentChapter)
 				animation_castle();
 			loadPic(96, frontSurface);
 			clearRoom();
@@ -330,7 +327,7 @@ void DrasculaEngine::endChapter() {
 bool DrasculaEngine::runCurrentChapter() {
 	int n;
 
-	rightMouseButton = 0;
+	_rightMouseButton = 0;
 
 	previousMusic = -1;
 
@@ -360,14 +357,14 @@ bool DrasculaEngine::runCurrentChapter() {
 	if (currentChapter == 1) {
 		pickObject(28);
 
-		if (loadedDifferentChapter == 0)
+		if (!_loadedDifferentChapter)
 			animation_1_1();
 
 		selectVerb(kVerbNone);
 		loadPic("2aux62.alg", drawSurface2);
 		trackProtagonist = 1;
 		objExit = 104;
-		if (loadedDifferentChapter != 0) {
+		if (_loadedDifferentChapter) {
 			if (!loadGame(_currentSaveSlot)) {
 				return true;
 			}
@@ -383,7 +380,7 @@ bool DrasculaEngine::runCurrentChapter() {
 		addObject(kItemPhone);
 		trackProtagonist = 3;
 		objExit = 162;
-		if (loadedDifferentChapter == 0)
+		if (!_loadedDifferentChapter)
 			enterRoom(14);
 		else {
 			if (!loadGame(_currentSaveSlot)) {
@@ -401,7 +398,7 @@ bool DrasculaEngine::runCurrentChapter() {
 		flags[1] = 1;
 		trackProtagonist = 1;
 		objExit = 99;
-		if (loadedDifferentChapter == 0)
+		if (!_loadedDifferentChapter)
 			enterRoom(20);
 		else {
 			if (!loadGame(_currentSaveSlot)) {
@@ -415,7 +412,7 @@ bool DrasculaEngine::runCurrentChapter() {
 		addObject(kItemReefer2);
 		addObject(kItemOneCoin2);
 		objExit = 100;
-		if (loadedDifferentChapter == 0) {
+		if (!_loadedDifferentChapter) {
 			enterRoom(21);
 			trackProtagonist = 0;
 			curX = 235;
@@ -437,7 +434,7 @@ bool DrasculaEngine::runCurrentChapter() {
 		addObject(20);
 		trackProtagonist = 1;
 		objExit = 100;
-		if (loadedDifferentChapter == 0) {
+		if (!_loadedDifferentChapter) {
 			enterRoom(45);
 		} else {
 			if (!loadGame(_currentSaveSlot)) {
@@ -450,7 +447,7 @@ bool DrasculaEngine::runCurrentChapter() {
 
 		trackProtagonist = 1;
 		objExit = 104;
-		if (loadedDifferentChapter == 0) {
+		if (!_loadedDifferentChapter) {
 			enterRoom(58);
 			animation_1_6();
 		} else {
@@ -480,13 +477,13 @@ bool DrasculaEngine::runCurrentChapter() {
 			// lead to an incorrect setting of the protagonist's tracking flag (above). This
 			// made the character start walking off screen, as his actual position was
 			// different than the displayed one
-			if (roomNumber == 3 && (curX == 279) && (curY + curHeight == 101)) {
+			if (_roomNumber == 3 && (curX == 279) && (curY + curHeight == 101)) {
 				gotoObject(178, 121);
 				gotoObject(169, 135);
-			} else if (roomNumber == 14 && (curX == 214) && (curY + curHeight == 121)) {
+			} else if (_roomNumber == 14 && (curX == 214) && (curY + curHeight == 121)) {
 				walkToObject = 1;
 				gotoObject(190, 130);
-			} else if (roomNumber == 14 && (curX == 246) && (curY + curHeight == 112)) {
+			} else if (_roomNumber == 14 && (curX == 246) && (curY + curHeight == 112)) {
 				walkToObject = 1;
 				gotoObject(190, 130);
 			}
@@ -518,12 +515,12 @@ bool DrasculaEngine::runCurrentChapter() {
 			checkObjects();
 
 #ifdef _WIN32_WCE
-		if (rightMouseButton) {
+		if (_rightMouseButton) {
 			if (_menuScreen) {
 #else
-		if (rightMouseButton == 1 && _menuScreen) {
+		if (_rightMouseButton == 1 && _menuScreen) {
 #endif
-			rightMouseButton = 0;
+			_rightMouseButton = 0;
 			delay(100);
 			if (currentChapter == 2) {
 				loadPic(menuBackground, cursorSurface);
@@ -549,10 +546,10 @@ bool DrasculaEngine::runCurrentChapter() {
 		// Do not show the inventory screen in chapter 5, if the right mouse button is clicked
 		// while the plug (object 16) is held
 		// Fixes bug #2059621 - "DRASCULA: Plug bug"
-		if (rightMouseButton == 1 && !_menuScreen &&
+		if (_rightMouseButton == 1 && !_menuScreen &&
 			!(currentChapter == 5 && pickedObject == 16)) {
 #endif
-			rightMouseButton = 0;
+			_rightMouseButton = 0;
 			delay(100);
 			characterMoved = 0;
 			if (trackProtagonist == 2)
@@ -580,19 +577,19 @@ bool DrasculaEngine::runCurrentChapter() {
 		}
 #endif
 
-		if (leftMouseButton == 1 && _menuBar) {
+		if (_leftMouseButton == 1 && _menuBar) {
 			delay(100);
 			selectVerbFromBar();
-		} else if (leftMouseButton == 1 && takeObject == 0) {
+		} else if (_leftMouseButton == 1 && takeObject == 0) {
 			delay(100);
 			if (verify1())
 				return true;
-		} else if (leftMouseButton == 1 && takeObject == 1) {
+		} else if (_leftMouseButton == 1 && takeObject == 1) {
 			if (verify2())
 				return true;
 		}
 
-		_menuBar = (mouseY < 24 && !_menuScreen) ? true : false;
+		_menuBar = (_mouseY < 24 && !_menuScreen) ? true : false;
 
 		Common::KeyCode key = getScan();
 		if (key == Common::KEYCODE_F1 && !_menuScreen) {
@@ -644,11 +641,11 @@ bool DrasculaEngine::runCurrentChapter() {
 		} else if (key == Common::KEYCODE_TILDE || key == Common::KEYCODE_BACKQUOTE) {
 			_console->attach();
 			_console->onFrame();
-		} else if (currentChapter == 6 && key == Common::KEYCODE_0 && roomNumber == 61) {
+		} else if (currentChapter == 6 && key == Common::KEYCODE_0 && _roomNumber == 61) {
 			loadPic("alcbar.alg", bgSurface, 255);
 		}
 
-		if (leftMouseButton != 0 || rightMouseButton != 0 || key != 0)
+		if (_leftMouseButton != 0 || _rightMouseButton != 0 || key != 0)
 			framesWithoutAction = 0;
 
 		if (framesWithoutAction == 15000) {
@@ -670,8 +667,8 @@ bool DrasculaEngine::verify1() {
 		removeObject();
 	else {
 		for (l = 0; l < numRoomObjs; l++) {
-			if (mouseX >= _objectX1[l] && mouseY >= _objectY1[l]
-					&& mouseX <= _objectX2[l] && mouseY <= _objectY2[l] && doBreak == 0) {
+			if (_mouseX >= _objectX1[l] && _mouseY >= _objectY1[l]
+					&& _mouseX <= _objectX2[l] && _mouseY <= _objectY2[l] && doBreak == 0) {
 				if (exitRoom(l))
 					return true;
 				if (doBreak == 1)
@@ -679,13 +676,13 @@ bool DrasculaEngine::verify1() {
 			}
 		}
 
-		if (mouseX > curX && mouseY > curY
-				&& mouseX < curX + curWidth && mouseY < curY + curHeight)
+		if (_mouseX > curX && _mouseY > curY
+				&& _mouseX < curX + curWidth && _mouseY < curY + curHeight)
 			doBreak = 1;
 
 		for (l = 0; l < numRoomObjs; l++) {
-			if (mouseX > _objectX1[l] && mouseY > _objectY1[l]
-					&& mouseX < _objectX2[l] && mouseY < _objectY2[l] && doBreak == 0) {
+			if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l]
+					&& _mouseX < _objectX2[l] && _mouseY < _objectY2[l] && doBreak == 0) {
 				roomX = roomObjX[l];
 				roomY = roomObjY[l];
 				trackFinal = trackObj[l];
@@ -696,8 +693,8 @@ bool DrasculaEngine::verify1() {
 		}
 
 		if (doBreak == 0) {
-			roomX = CLIP(mouseX, floorX1, floorX2);
-			roomY = CLIP(mouseY, floorY1 + feetHeight, floorY2);
+			roomX = CLIP(_mouseX, floorX1, floorX2);
+			roomY = CLIP(_mouseY, floorY1 + feetHeight, floorY2);
 			startWalking();
 		}
 		doBreak = 0;
@@ -718,8 +715,8 @@ bool DrasculaEngine::verify2() {
 				return true;
 		} else {
 			for (l = 0; l < numRoomObjs; l++) {
-				if (mouseX > _objectX1[l] && mouseY > _objectY1[l]
-						&& mouseX < _objectX2[l] && mouseY < _objectY2[l] && visible[l] == 1) {
+				if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l]
+						&& _mouseX < _objectX2[l] && _mouseY < _objectY2[l] && visible[l] == 1) {
 					trackFinal = trackObj[l];
 					walkToObject = 1;
 					gotoObject(roomObjX[l], roomObjY[l]);
@@ -779,20 +776,20 @@ void DrasculaEngine::updateEvents() {
 		case Common::EVENT_KEYUP:
 			break;
 		case Common::EVENT_MOUSEMOVE:
-			mouseX = event.mouse.x;
-			mouseY = event.mouse.y;
+			_mouseX = event.mouse.x;
+			_mouseY = event.mouse.y;
 			break;
 		case Common::EVENT_LBUTTONDOWN:
-			leftMouseButton = 1;
+			_leftMouseButton = 1;
 			break;
 		case Common::EVENT_LBUTTONUP:
-			leftMouseButton = 0;
+			_leftMouseButton = 0;
 			break;
 		case Common::EVENT_RBUTTONDOWN:
 			// We changed semantic and react only on button up event
 			break;
 		case Common::EVENT_RBUTTONUP:
-			rightMouseButton = 1;
+			_rightMouseButton = 1;
 			break;
 		default:
 			break;
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index c4d1c4c761..944191b5fb 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -403,7 +403,7 @@ public:
 	int actorFrames[8];
 
 	int previousMusic, roomMusic;
-	int roomNumber;
+	int _roomNumber;
 	char roomDisk[20];
 	char currentData[20];
 	int numRoomObjs;
@@ -428,18 +428,17 @@ public:
 	int flags[NUM_FLAGS];
 
 	int frame_y;
-	int curX, curY, characterMoved, curDirection, trackProtagonist, num_frame;
+	int curX, curY, characterMoved, curDirection, trackProtagonist, _characterFrame;
 	int hare_se_ve;		// TODO: what is this for?
 	int roomX, roomY, checkFlags;
 	int doBreak;
 	int stepX, stepY;
 	int curHeight, curWidth, feetHeight;
-	int talkHeight, talkWidth;
 	int floorX1, floorY1, floorX2, floorY2;
 	int lowerLimit, upperLimit;
 	int trackFinal, walkToObject;
 	int objExit;
-	int timeDiff, startTime;
+	int _startTime;
 	int hasAnswer;
 	int savedTime;
 	int breakOut;
@@ -454,14 +453,11 @@ public:
 	int framesWithoutAction;
 	int term_int;
 	int currentChapter;
-	int loadedDifferentChapter;
+	bool _loadedDifferentChapter;
 	int _currentSaveSlot;
 	int _color;
 	int musicStopped;
-	int mouseX;
-	int mouseY;
-	int leftMouseButton;
-	int rightMouseButton;
+	int _mouseX, _mouseY, _leftMouseButton, _rightMouseButton;
 
 	Common::KeyState _keyBuffer[KEYBUFSIZE];
 	int _keyBufferHead;
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 31d03a94a7..b28de669b6 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -82,7 +82,7 @@ void DrasculaEngine::moveCursor() {
 	} else if (!_menuScreen && _color != kColorLightGreen)
 		color_abc(kColorLightGreen);
 	if (_hasName && !_menuScreen)
-		centerText(textName, mouseX, mouseY);
+		centerText(textName, _mouseX, _mouseY);
 	if (_menuScreen)
 		showMenu();
 	else if (_menuBar)
@@ -417,8 +417,8 @@ void DrasculaEngine::screenSaver() {
 	delete stream;
 
 	updateEvents();
-	xr = mouseX;
-	yr = mouseY;
+	xr = _mouseX;
+	yr = _mouseY;
 
 	while (!shouldQuit()) {
 		// efecto(bgSurface);
@@ -480,18 +480,18 @@ void DrasculaEngine::screenSaver() {
 		// end of efecto()
 
 		updateEvents();
-		if (rightMouseButton == 1 || leftMouseButton == 1)
+		if (_rightMouseButton == 1 || _leftMouseButton == 1)
 			break;
-		if (mouseX != xr)
+		if (_mouseX != xr)
 			break;
-		if (mouseY != yr)
+		if (_mouseY != yr)
 			break;
 	}
 	// fin_ghost();
 	free(copia);
 	free(ghost);
 
-	loadPic(roomNumber, bgSurface, HALF_PAL);
+	loadPic(_roomNumber, bgSurface, HALF_PAL);
 	showCursor();
 }
 
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp
index fca8040f59..f0b6d12027 100644
--- a/engines/drascula/interface.cpp
+++ b/engines/drascula/interface.cpp
@@ -51,7 +51,7 @@ bool DrasculaEngine::isCursorVisible() {
 
 void DrasculaEngine::selectVerbFromBar() {
 	for (int n = 0; n < 7; n++) {
-		if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1] && n > 0) {
+		if (_mouseX > _verbBarX[n] && _mouseX < _verbBarX[n + 1] && n > 0) {
 			selectVerb(n);
 			return;
 		}
@@ -143,7 +143,7 @@ void DrasculaEngine::clearMenu() {
 	int n, verbActivated = 1;
 
 	for (n = 0; n < 7; n++) {
-		if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1])
+		if (_mouseX > _verbBarX[n] && _mouseX < _verbBarX[n + 1])
 			verbActivated = 0;
 		copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, _verbBarX[n], 2,
 						OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface);
@@ -165,8 +165,8 @@ void DrasculaEngine::showMap() {
 	_hasName = false;
 
 	for (int l = 0; l < numRoomObjs; l++) {
-		if (mouseX > _objectX1[l] && mouseY > _objectY1[l]
-				&& mouseX < _objectX2[l] && mouseY < _objectY2[l]
+		if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l]
+				&& _mouseX < _objectX2[l] && _mouseY < _objectY2[l]
 				&& visible[l] == 1) {
 			strcpy(textName, objName[l]);
 			_hasName = true;
diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp
index f9f68c3317..35dfd3162a 100644
--- a/engines/drascula/objects.cpp
+++ b/engines/drascula/objects.cpp
@@ -91,8 +91,8 @@ void DrasculaEngine::gotoObject(int pointX, int pointY) {
 	updateRoom();
 	updateScreen();
 
-	// roomNumber -2 is end credits. Do not show cursor there
-	if (cursorVisible && roomNumber != -2)
+	// _roomNumber -2 is end credits. Do not show cursor there
+	if (cursorVisible && _roomNumber != -2)
 		showCursor();
 }
 
@@ -100,8 +100,8 @@ void DrasculaEngine::checkObjects() {
 	int l, veo = 0;
 
 	for (l = 0; l < numRoomObjs; l++) {
-		if (mouseX > _objectX1[l] && mouseY > _objectY1[l]
-				&& mouseX < _objectX2[l] && mouseY < _objectY2[l]
+		if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l]
+				&& _mouseX < _objectX2[l] && _mouseY < _objectY2[l]
 				&& visible[l] == 1 && isDoor[l] == 0) {
 			strcpy(textName, objName[l]);
 			_hasName = true;
@@ -109,8 +109,8 @@ void DrasculaEngine::checkObjects() {
 		}
 	}
 
-	if (mouseX > curX + 2 && mouseY > curY + 2
-			&& mouseX < curX + curWidth - 2 && mouseY < curY + curHeight - 2) {
+	if (_mouseX > curX + 2 && _mouseY > curY + 2
+			&& _mouseX < curX + curWidth - 2 && _mouseY < curY + curHeight - 2) {
 		if (currentChapter == 2 || veo == 0) {
 			strcpy(textName, "hacker");
 			_hasName = true;
@@ -223,9 +223,9 @@ int DrasculaEngine::whichObject() {
 	int n;
 
 	for (n = 1; n < ARRAYSIZE(inventoryObjects); n++) {
-		if (mouseX > _itemLocations[n].x && mouseY > _itemLocations[n].y &&
-			mouseX < _itemLocations[n].x + OBJWIDTH &&
-			mouseY < _itemLocations[n].y + OBJHEIGHT) {
+		if (_mouseX > _itemLocations[n].x && _mouseY > _itemLocations[n].y &&
+			_mouseX < _itemLocations[n].x + OBJWIDTH &&
+			_mouseY < _itemLocations[n].y + OBJHEIGHT) {
 			return n;
 		}
 	}
@@ -237,69 +237,69 @@ void DrasculaEngine::updateVisible() {
 	if (currentChapter == 1) {
 		// nothing
 	} else if (currentChapter == 2) {
-		if (roomNumber == 2 && flags[40] == 0)
+		if (_roomNumber == 2 && flags[40] == 0)
 			visible[3] = 0;
-		else if (roomNumber == 3 && flags[3] == 1)
+		else if (_roomNumber == 3 && flags[3] == 1)
 			visible[8] = 0;
-		else if (roomNumber == 6 && flags[1] == 1 && flags[10] == 0) {
+		else if (_roomNumber == 6 && flags[1] == 1 && flags[10] == 0) {
 			visible[2] = 0;
 			visible[4] = 1;
-		} else if (roomNumber == 7 && flags[35] == 1)
+		} else if (_roomNumber == 7 && flags[35] == 1)
 			visible[3] = 0;
-		else if (roomNumber == 14 && flags[5] == 1)
+		else if (_roomNumber == 14 && flags[5] == 1)
 			visible[4] = 0;
-		else if (roomNumber == 18 && flags[28] == 1)
+		else if (_roomNumber == 18 && flags[28] == 1)
 			visible[2] = 0;
 	} else if (currentChapter == 3) {
 		// nothing
 	} else if (currentChapter == 4) {
-		if (roomNumber == 23 && flags[0] == 0 && flags[11] == 0)
+		if (_roomNumber == 23 && flags[0] == 0 && flags[11] == 0)
 			visible[2] = 1;
-		if (roomNumber == 23 && flags[0] == 1 && flags[11] == 0)
+		if (_roomNumber == 23 && flags[0] == 1 && flags[11] == 0)
 			visible[2] = 0;
-		if (roomNumber == 21 && flags[10] == 1)
+		if (_roomNumber == 21 && flags[10] == 1)
 			visible[2] = 0;
-		if (roomNumber == 22 && flags[26] == 1) {
+		if (_roomNumber == 22 && flags[26] == 1) {
 			visible[2] = 0;
 			visible[1] = 1;
 		}
-		if (roomNumber == 22 && flags[27] == 1)
+		if (_roomNumber == 22 && flags[27] == 1)
 			visible[3] = 0;
-		if (roomNumber == 26 && flags[21] == 0)
+		if (_roomNumber == 26 && flags[21] == 0)
 			strcpy(objName[2], _textmisc[0]);
-		if (roomNumber == 26 && flags[18] == 1)
+		if (_roomNumber == 26 && flags[18] == 1)
 			visible[2] = 0;
-		if (roomNumber == 26 && flags[12] == 1)
+		if (_roomNumber == 26 && flags[12] == 1)
 			visible[1] = 0;
-		if (roomNumber == 35 && flags[14] == 1)
+		if (_roomNumber == 35 && flags[14] == 1)
 			visible[2] = 0;
-		if (roomNumber == 35 && flags[17] == 1)
+		if (_roomNumber == 35 && flags[17] == 1)
 			visible[3] = 1;
-		if (roomNumber == 35 && flags[15] == 1)
+		if (_roomNumber == 35 && flags[15] == 1)
 			visible[1] = 0;
 	} else if (currentChapter == 5) {
-		if (roomNumber == 49 && flags[6] == 1)
+		if (_roomNumber == 49 && flags[6] == 1)
 			visible[2] = 0;
-		if (roomNumber == 49 && flags[6] == 0)
+		if (_roomNumber == 49 && flags[6] == 0)
 			visible[1] = 0;
-		if (roomNumber == 49 && flags[6] == 1)
+		if (_roomNumber == 49 && flags[6] == 1)
 			visible[1] = 1;
-		if (roomNumber == 45 && flags[6] == 1)
+		if (_roomNumber == 45 && flags[6] == 1)
 			visible[3] = 1;
-		if (roomNumber == 53 && flags[2] == 1)
+		if (_roomNumber == 53 && flags[2] == 1)
 			visible[3] = 0;
-		if (roomNumber == 54 && flags[13] == 1)
+		if (_roomNumber == 54 && flags[13] == 1)
 			visible[3] = 0;
-		if (roomNumber == 55 && flags[8] == 1)
+		if (_roomNumber == 55 && flags[8] == 1)
 			visible[1] = 0;
 	} else if (currentChapter == 6) {
-		if (roomNumber == 58 && flags[8] == 0)
+		if (_roomNumber == 58 && flags[8] == 0)
 			isDoor[1] = 0;
-		if (roomNumber == 58 && flags[8] == 1)
+		if (_roomNumber == 58 && flags[8] == 1)
 			isDoor[1] = 1;
-		if (roomNumber == 59)
+		if (_roomNumber == 59)
 			isDoor[1] = 0;
-		if (roomNumber == 60) {
+		if (_roomNumber == 60) {
 			trackDrascula = 0;
 			drasculaX = 155;
 			drasculaY = 69;
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 9f707eaa07..25f3da0080 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -1087,7 +1087,7 @@ bool DrasculaEngine::room_102(int fl) {
 void DrasculaEngine::updateRefresh() {
 	// Check generic updaters
 	for (int i = 0; i < _roomUpdatesSize; i++) {
-		if (_roomUpdates[i].roomNum == roomNumber) {
+		if (_roomUpdates[i].roomNum == _roomNumber) {
 			if (_roomUpdates[i].flag < 0 ||
 				flags[_roomUpdates[i].flag] == _roomUpdates[i].flagValue) {
 				if (_roomUpdates[i].type == 0) {
@@ -1107,25 +1107,25 @@ void DrasculaEngine::updateRefresh() {
 
 	// Call room-specific updater
 	char rm[20];
-	sprintf(rm, "update_%d", roomNumber);
+	sprintf(rm, "update_%d", _roomNumber);
 	for (uint i = 0; i < _roomHandlers->roomUpdaters.size(); i++) {
 		if (!strcmp(rm, _roomHandlers->roomUpdaters[i]->desc)) {
-			debug(8, "Calling room updater %d", roomNumber);
+			debug(8, "Calling room updater %d", _roomNumber);
 			(this->*(_roomHandlers->roomUpdaters[i]->proc))();
 			break;
 		}
 	}
 
-	if (roomNumber == 10)
+	if (_roomNumber == 10)
 		showMap();
-	else if (roomNumber == 45)
+	else if (_roomNumber == 45)
 		showMap();
 }
 
 void DrasculaEngine::updateRefresh_pre() {
 	// Check generic preupdaters
 	for (int i = 0; i < _roomPreUpdatesSize; i++) {
-		if (_roomPreUpdates[i].roomNum == roomNumber) {
+		if (_roomPreUpdates[i].roomNum == _roomNumber) {
 			if (_roomPreUpdates[i].flag < 0 ||
 				flags[_roomPreUpdates[i].flag] == _roomPreUpdates[i].flagValue) {
 				if (_roomPreUpdates[i].type == 0) {
@@ -1145,16 +1145,16 @@ void DrasculaEngine::updateRefresh_pre() {
 
 	// Call room-specific preupdater
 	char rm[20];
-	sprintf(rm, "update_%d_pre", roomNumber);
+	sprintf(rm, "update_%d_pre", _roomNumber);
 	for (uint i = 0; i < _roomHandlers->roomPreupdaters.size(); i++) {
 		if (!strcmp(rm, _roomHandlers->roomPreupdaters[i]->desc)) {
-			debug(8, "Calling room preupdater %d", roomNumber);
+			debug(8, "Calling room preupdater %d", _roomNumber);
 			(this->*(_roomHandlers->roomPreupdaters[i]->proc))();
 			break;
 		}
 	}
 
-	if (currentChapter == 1 && roomNumber == 16)
+	if (currentChapter == 1 && _roomNumber == 16)
 		placeBJ();
 }
 
@@ -1577,12 +1577,12 @@ bool DrasculaEngine::checkAction(int fl) {
 			hasAnswer = 0;
 		} else if (currentChapter == 2) {
 			// Note: the original check was strcmp(num_room, "18.alg")
-			if (pickedObject == 11 && fl == 50 && flags[22] == 0 && roomNumber != 18)
+			if (pickedObject == 11 && fl == 50 && flags[22] == 0 && _roomNumber != 18)
 				talk(315);
 			else
 				hasAnswer = 0;
 		} else if (currentChapter == 3) {
-			if (roomNumber == 13) {
+			if (_roomNumber == 13) {
 				if (room(13, fl)) {
 					showCursor();
 					return true;
@@ -1590,13 +1590,13 @@ bool DrasculaEngine::checkAction(int fl) {
 			} else
 				hasAnswer = 0;
 		} else if (currentChapter == 4) {
-			if (roomNumber == 28)
+			if (_roomNumber == 28)
 				talk(178);
 			else if (pickedObject == 8 && fl == 50 && flags[18] == 0)
 				talk(481);
 			else if (pickedObject == 12 && fl == 50 && flags[18] == 0)
 				talk(487);
-			else if (roomNumber == 21) {
+			else if (_roomNumber == 21) {
 				if (room(21, fl)) {
 					showCursor();
 					return true;
@@ -1604,7 +1604,7 @@ bool DrasculaEngine::checkAction(int fl) {
 			} else
 				hasAnswer = 0;
 		} else if (currentChapter == 5) {
-			if (roomNumber == 56) {
+			if (_roomNumber == 56) {
 				if (room(56, fl)) {
 					showCursor();
 					return true;
@@ -1616,9 +1616,9 @@ bool DrasculaEngine::checkAction(int fl) {
 				talk(308);
 			else if (pickedObject == kVerbLook && fl == 50 && flags[0] == 0)
 				talk(310);
-			else if (roomNumber == 102)
+			else if (_roomNumber == 102)
 				room(102, fl);
-			else if (roomNumber == 60) {
+			else if (_roomNumber == 60) {
 				if (room(60, fl)) {
 					showCursor();
 					return true;
@@ -1632,7 +1632,7 @@ bool DrasculaEngine::checkAction(int fl) {
 	if (hasAnswer == 0) {
 		hasAnswer = 1;
 
-		room(roomNumber, fl);
+		room(_roomNumber, fl);
 	}
 
 	if (hasAnswer == 0 && (_hasName || _menuScreen))
@@ -1684,7 +1684,7 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 
 	TextResourceParser p(stream, DisposeAfterUse::YES);
 
-	p.parseInt(roomNumber);
+	p.parseInt(_roomNumber);
 	p.parseInt(roomMusic);
 	p.parseString(roomDisk);
 	p.parseInt(palLevel);
@@ -1778,7 +1778,7 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 	}
 
 	loadPic(roomDisk, drawSurface3);
-	loadPic(roomNumber, bgSurface, HALF_PAL);
+	loadPic(_roomNumber, bgSurface, HALF_PAL);
 
 	copyBackground(0, 171, 0, 0, OBJWIDTH, OBJHEIGHT, backSurface, drawSurface3);
 
@@ -1808,14 +1808,14 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 		}
 	}
 
-	if (roomNumber == 24) {
+	if (_roomNumber == 24) {
 		for (l = floorY1 - 1; l > 74; l--) {
 			factor_red[l] = (int)(upperLimit - pequegnez);
 			pequegnez = pequegnez + chiquez;
 		}
 	}
 
-	if (currentChapter == 5 && roomNumber == 54) {
+	if (currentChapter == 5 && _roomNumber == 54) {
 		for (l = floorY1 - 1; l > 84; l--) {
 			factor_red[l] = (int)(upperLimit - pequegnez);
 			pequegnez = pequegnez + chiquez;
@@ -1853,13 +1853,13 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 		isDoor[7] = 0;
 
 	if (currentChapter == 2) {
-		if (roomNumber == 14 && flags[39] == 1)
+		if (_roomNumber == 14 && flags[39] == 1)
 			roomMusic = 16;
-		else if (roomNumber == 15 && flags[39] == 1)
+		else if (_roomNumber == 15 && flags[39] == 1)
 			roomMusic = 16;
-		if (roomNumber == 14 && flags[5] == 1)
+		if (_roomNumber == 14 && flags[5] == 1)
 			roomMusic = 0;
-		else if (roomNumber == 15 && flags[5] == 1)
+		else if (_roomNumber == 15 && flags[5] == 1)
 			roomMusic = 0;
 
 		if (previousMusic != roomMusic && roomMusic != 0)
@@ -1872,21 +1872,21 @@ void DrasculaEngine::enterRoom(int roomIndex) {
 	}
 
 	if (currentChapter == 2) {
-		if (roomNumber == 9 || roomNumber == 2 || roomNumber == 14 || roomNumber == 18)
+		if (_roomNumber == 9 || _roomNumber == 2 || _roomNumber == 14 || _roomNumber == 18)
 			savedTime = getTime();
 	}
 	if (currentChapter == 4) {
-		if (roomNumber == 26)
+		if (_roomNumber == 26)
 			savedTime = getTime();
 	}
 
-	if (currentChapter == 4 && roomNumber == 24 && flags[29] == 1)
+	if (currentChapter == 4 && _roomNumber == 24 && flags[29] == 1)
 		animation_7_4();
 
 	if (currentChapter == 5) {
-		if (roomNumber == 45)
+		if (_roomNumber == 45)
 			hare_se_ve = 0;
-		if (roomNumber == 49 && flags[7] == 0) {
+		if (_roomNumber == 49 && flags[7] == 0) {
 			playTalkSequence(4);	// sequence 4, chapter 5
 		}
 	}
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index 996c9d3f03..61d6f0b4af 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -263,7 +263,7 @@ bool DrasculaEngine::loadGame(int slot) {
 	if (savedChapter != currentChapter) {
 		_currentSaveSlot = slot;
 		currentChapter = savedChapter - 1;
-		loadedDifferentChapter = 1;
+		_loadedDifferentChapter = true;
 		delete in;
 		return false;
 	}
@@ -283,7 +283,7 @@ bool DrasculaEngine::loadGame(int slot) {
 
 	takeObject = in->readSint32LE();
 	pickedObject = in->readSint32LE();
-	loadedDifferentChapter = 0;
+	_loadedDifferentChapter = false;
 	if (!sscanf(currentData, "%d.ald", &roomNum)) {
 		error("Bad save format");
 	}
@@ -383,10 +383,10 @@ bool DrasculaEngine::saveLoadScreen() {
 		updateScreen();
 		updateEvents();
 
-		if (leftMouseButton == 1) {
+		if (_leftMouseButton == 1) {
 			// Check if the user has clicked on a save slot
 			for (n = 0; n < NUM_SAVES; n++) {
-				if (mouseX > 115 && mouseY > 27 + (9 * n) && mouseX < 115 + 175 && mouseY < 27 + 10 + (9 * n)) {
+				if (_mouseX > 115 && _mouseY > 27 + (9 * n) && _mouseX < 115 + 175 && _mouseY < 27 + 10 + (9 * n)) {
 					selectedSlot = n;
 					selectedName = _saveNames[selectedSlot];
 					if (selectedName.empty()) {
@@ -399,14 +399,14 @@ bool DrasculaEngine::saveLoadScreen() {
 			}
 
 			// Check if the user has clicked in the text area above the save slots
-			if (mouseX > 117 && mouseY > 15 && mouseX < 295 && mouseY < 24 && !selectedName.empty()) {
+			if (_mouseX > 117 && _mouseY > 15 && _mouseX < 295 && _mouseY < 24 && !selectedName.empty()) {
 				selectedName = enterName(selectedName);
 				if (!selectedName.empty())
 					_saveNames[selectedSlot] = selectedName;	// update save name
 			}
 
 			// Check if the user has clicked a button
-			if (mouseX > 208 && mouseY > 123 && mouseX < 282 && mouseY < 149) {
+			if (_mouseX > 208 && _mouseY > 123 && _mouseX < 282 && _mouseY < 149) {
 				// "Save" button
 				if (selectedName.empty()) {
 					print_abc("Please select a slot", 117, 15);
@@ -415,14 +415,14 @@ bool DrasculaEngine::saveLoadScreen() {
 				} else {
 					selectVerb(kVerbNone);
 					clearRoom();
-					loadPic(roomNumber, bgSurface, HALF_PAL);
+					loadPic(_roomNumber, bgSurface, HALF_PAL);
 					updateRoom();
 					updateScreen();
 
 					saveGame(selectedSlot + 1, _saveNames[selectedSlot]);
 					return true;
 				}
-			} else if (mouseX > 125 && mouseY > 123 && mouseX < 199 && mouseY < 149) {
+			} else if (_mouseX > 125 && _mouseY > 123 && _mouseX < 199 && _mouseY < 149) {
 				// "Load" button
 				if (selectedName.empty()) {
 					print_abc("Please select a slot", 117, 15);
@@ -431,19 +431,19 @@ bool DrasculaEngine::saveLoadScreen() {
 				} else {
 					return loadGame(selectedSlot + 1);
 				}
-			} else if (mouseX > 168 && mouseY > 154 && mouseX < 242 && mouseY < 180) {
+			} else if (_mouseX > 168 && _mouseY > 154 && _mouseX < 242 && _mouseY < 180) {
 				// "Play" button
 				break;
 			}
-		}	// if (leftMouseButton == 1)
+		}	// if (_leftMouseButton == 1)
 
-		leftMouseButton = 0;
+		_leftMouseButton = 0;
 		delay(10);
 	}
 
 	selectVerb(kVerbNone);
 	clearRoom();
-	loadPic(roomNumber, bgSurface, HALF_PAL);
+	loadPic(_roomNumber, bgSurface, HALF_PAL);
 	return true;
 }
 
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 112f6fd06c..59b5e1d237 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -36,9 +36,9 @@ namespace Drascula {
 
 void DrasculaEngine::updateVolume(Audio::Mixer::SoundType soundType, int prevVolume) {
 	int vol = _mixer->getVolumeForSoundType(soundType) / 16;
-	if (mouseY < prevVolume && vol < 15)
+	if (_mouseY < prevVolume && vol < 15)
 		vol++;
-	if (mouseY > prevVolume && vol > 0)
+	if (_mouseY > prevVolume && vol > 0)
 		vol--;
 	_mixer->setVolumeForSoundType(soundType, vol * 16);
 }
@@ -78,23 +78,23 @@ void DrasculaEngine::volumeControls() {
 		while (getScan())
 			;
 
-		if (rightMouseButton == 1) {
+		if (_rightMouseButton == 1) {
 			// Clear this to avoid going straight to the inventory
-			rightMouseButton = 0;
+			_rightMouseButton = 0;
 			delay(100);
 			break;
 		}
-		if (leftMouseButton == 1) {
+		if (_leftMouseButton == 1) {
 			delay(100);
-			if (mouseX > 80 && mouseX < 121) {
+			if (_mouseX > 80 && _mouseX < 121) {
 				updateVolume(Audio::Mixer::kPlainSoundType, masterVolumeY);
 			}
 
-			if (mouseX > 136 && mouseX < 178) {
+			if (_mouseX > 136 && _mouseX < 178) {
 				updateVolume(Audio::Mixer::kSpeechSoundType, voiceVolumeY);
 			}
 
-			if (mouseX > 192 && mouseX < 233) {
+			if (_mouseX > 192 && _mouseX < 233) {
 				updateVolume(Audio::Mixer::kMusicSoundType, musicVolumeY);
 			}
 		}
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index a326852e96..6aabd91c6a 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -381,11 +381,11 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 	int face;
 
 	if (currentChapter == 6) {
-		if (flags[0] == 0 && roomNumber == 102) {
+		if (flags[0] == 0 && _roomNumber == 102) {
 			talk_pen(said, filename, 0);
 			return;
 		}
-		if (flags[0] == 0 && roomNumber == 58) {
+		if (flags[0] == 0 && _roomNumber == 58) {
 			talk_pen(said, filename, 1);
 			return;
 		}
@@ -397,7 +397,7 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 	}
 
 	if (currentChapter == 4) {
-		if (roomNumber == 24 || flags[29] == 0) {
+		if (_roomNumber == 24 || flags[29] == 0) {
 			color_abc(kColorYellow);
 		}
 	} else {
@@ -413,59 +413,59 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 
 		updateRefresh_pre();
 		if (currentChapter == 2)
-			copyBackground(curX, curY, OBJWIDTH + 1, 0, curWidth, talkHeight - 1, screenSurface, drawSurface3);
+			copyBackground(curX, curY, OBJWIDTH + 1, 0, curWidth, TALK_HEIGHT - 1, screenSurface, drawSurface3);
 		else
 			copyBackground(curX, curY, OBJWIDTH + 1, 0, (int)(((float)curWidth / 100) * factor_red[MIN(201, curY + curHeight)]),
-					   (int)(((float)(talkHeight - 1) / 100) * factor_red[MIN(201, curY + curHeight)]),
+					   (int)(((float)(TALK_HEIGHT - 1) / 100) * factor_red[MIN(201, curY + curHeight)]),
 						   screenSurface, drawSurface3);
 
 		moveCharacters();
 
 		if (currentChapter == 2) {
 			if (!strcmp(menuBackground, "99.alg") || !strcmp(menuBackground, "994.alg"))
-				copyBackground(OBJWIDTH + 1, 0, curX, curY, curWidth, talkHeight - 1, drawSurface3, screenSurface);
+				copyBackground(OBJWIDTH + 1, 0, curX, curY, curWidth, TALK_HEIGHT - 1, drawSurface3, screenSurface);
 		} else {
 			copyBackground(OBJWIDTH + 1, 0, curX, curY, (int)(((float)curWidth / 100) * factor_red[MIN(201, curY + curHeight)]),
-					   (int)(((float)(talkHeight - 1) / 100) * factor_red[MIN(201, curY + curHeight)]),
+					   (int)(((float)(TALK_HEIGHT - 1) / 100) * factor_red[MIN(201, curY + curHeight)]),
 						   drawSurface3, screenSurface);
 		}
 
 		if (trackProtagonist == 0) {
 			if (currentChapter == 2)
-				copyRect(x_talk_izq[face], y_mask_talk, curX + 8, curY - 1, talkWidth, talkHeight,
+				copyRect(x_talk_izq[face], y_mask_talk, curX + 8, curY - 1, TALK_WIDTH, TALK_HEIGHT,
 						extraSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk, curX + (int)((8.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, talkWidth, talkHeight, factor_red[MIN(201, curY + curHeight)],
+						curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
 						extraSurface, screenSurface);
 
 			updateRefresh();
 		} else if (trackProtagonist == 1) {
 			if (currentChapter == 2)
-				copyRect(x_talk_dch[face], y_mask_talk, curX + 12, curY, talkWidth, talkHeight,
+				copyRect(x_talk_dch[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT,
 					extraSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk, curX + (int)((12.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-					curY, talkWidth, talkHeight, factor_red[MIN(201, curY + curHeight)], extraSurface, screenSurface);
+					curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)], extraSurface, screenSurface);
 			updateRefresh();
 		} else if (trackProtagonist == 2) {
 			if (currentChapter == 2)
-				copyRect(x_talk_izq[face], y_mask_talk, curX + 12, curY, talkWidth, talkHeight,
+				copyRect(x_talk_izq[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT,
 					frontSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk,
 						talkOffset + curX + (int)((12.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, talkWidth, talkHeight, factor_red[MIN(201, curY + curHeight)],
+						curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
 						frontSurface, screenSurface);
 			updateRefresh();
 		} else if (trackProtagonist == 3) {
 			if (currentChapter == 2)
-				copyRect(x_talk_dch[face], y_mask_talk, curX + 8, curY, talkWidth, talkHeight,
+				copyRect(x_talk_dch[face], y_mask_talk, curX + 8, curY, TALK_WIDTH, TALK_HEIGHT,
 					frontSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk,
 						talkOffset + curX + (int)((8.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, talkWidth,talkHeight, factor_red[MIN(201, curY + curHeight)],
+						curY, TALK_WIDTH,TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
 						frontSurface, screenSurface);
 			updateRefresh();
 		}
@@ -827,47 +827,47 @@ void DrasculaEngine::talk_sync(const char *said, const char *filename, const cha
 
 		updateRefresh_pre();
 		if (currentChapter == 2)
-			copyBackground(curX, curY, OBJWIDTH + 1, 0, curWidth, talkHeight - 1, screenSurface, drawSurface3);
+			copyBackground(curX, curY, OBJWIDTH + 1, 0, curWidth, TALK_HEIGHT - 1, screenSurface, drawSurface3);
 		else
 			copyBackground(curX, curY, OBJWIDTH + 1, 0, (int)(((float)curWidth / 100) * factor_red[curY + curHeight]),
-				(int)(((float)(talkHeight - 1) / 100) * factor_red[curY + curHeight]), screenSurface, drawSurface3);
+				(int)(((float)(TALK_HEIGHT - 1) / 100) * factor_red[curY + curHeight]), screenSurface, drawSurface3);
 		moveCharacters();
 		if (currentChapter == 2) {
 			if (curHeight != 56)
-				copyBackground(OBJWIDTH + 1, 0, curX, curY, curWidth, talkHeight - 1, drawSurface3, screenSurface);
+				copyBackground(OBJWIDTH + 1, 0, curX, curY, curWidth, TALK_HEIGHT - 1, drawSurface3, screenSurface);
 		} else
 			copyBackground(OBJWIDTH + 1, 0, curX, curY, (int)(((float)curWidth / 100) * factor_red[curY + curHeight]),
-				(int)(((float)(talkHeight - 1) / 100) * factor_red[curY + curHeight]), drawSurface3, screenSurface);
+				(int)(((float)(TALK_HEIGHT - 1) / 100) * factor_red[curY + curHeight]), drawSurface3, screenSurface);
 
 		if (trackProtagonist == 0) {
 			if (currentChapter == 2)
-				copyRect(x_talk_izq[face], y_mask_talk, curX + 8, curY - 1, talkWidth, talkHeight, extraSurface, screenSurface);
+				copyRect(x_talk_izq[face], y_mask_talk, curX + 8, curY - 1, TALK_WIDTH, TALK_HEIGHT, extraSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk, (int)(curX + (8.0f / 100) * factor_red[curY + curHeight]),
-							curY, talkWidth, talkHeight, factor_red[curY + curHeight], extraSurface, screenSurface);
+							curY, TALK_WIDTH, TALK_HEIGHT, factor_red[curY + curHeight], extraSurface, screenSurface);
 			updateRefresh();
 		} else if (trackProtagonist == 1) {
 			if (currentChapter == 2)
-				copyRect(x_talk_dch[face], y_mask_talk, curX + 12, curY, talkWidth, talkHeight, extraSurface, screenSurface);
+				copyRect(x_talk_dch[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT, extraSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk, (int)(curX + (12.0f / 100) * factor_red[curY + curHeight]),
-							curY, talkWidth, talkHeight, factor_red[curY + curHeight], extraSurface, screenSurface);
+							curY, TALK_WIDTH, TALK_HEIGHT, factor_red[curY + curHeight], extraSurface, screenSurface);
 			updateRefresh();
 		} else if (trackProtagonist == 2) {
 			if (currentChapter == 2)
-				copyRect(x_talk_izq[face], y_mask_talk, curX + 12, curY, talkWidth, talkHeight, frontSurface, screenSurface);
+				copyRect(x_talk_izq[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT, frontSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk,
 						(int)(talkOffset + curX + (12.0f / 100) * factor_red[curY + curHeight]), curY,
-						talkWidth, talkHeight, factor_red[curY + curHeight], frontSurface, screenSurface);
+						TALK_WIDTH, TALK_HEIGHT, factor_red[curY + curHeight], frontSurface, screenSurface);
 			updateRefresh();
 		} else if (trackProtagonist == 3) {
 			if (currentChapter == 2)
-				copyRect(x_talk_dch[face], y_mask_talk, curX + 8, curY, talkWidth, talkHeight, frontSurface, screenSurface);
+				copyRect(x_talk_dch[face], y_mask_talk, curX + 8, curY, TALK_WIDTH, TALK_HEIGHT, frontSurface, screenSurface);
 			else
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk,
 						(int)(talkOffset + curX + (8.0f / 100) * factor_red[curY + curHeight]), curY,
-						talkWidth, talkHeight, factor_red[curY + curHeight], frontSurface, screenSurface);
+						TALK_WIDTH, TALK_HEIGHT, factor_red[curY + curHeight], frontSurface, screenSurface);
 			updateRefresh();
 		}