From d116a94e2b3aaed238aa370c11bc21d455b8b5a9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 13 May 2009 11:59:49 +0000
Subject: Normalized types for several variables. Formatting

svn-id: r40521
---
 engines/drascula/graphics.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index d97f95c5ef..76a551c980 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -73,16 +73,16 @@ void DrasculaEngine::moveCursor() {
 	moveCharacters();
 	updateRefresh();
 
-	if (!strcmp(textName, "hacker") && hasName == 1) {
-		if (_color != kColorRed && menuScreen == 0)
+	if (!strcmp(textName, "hacker") && _hasName) {
+		if (_color != kColorRed && !_menuScreen)
 			color_abc(kColorRed);
-	} else if (menuScreen == 0 && _color != kColorLightGreen)
+	} else if (!_menuScreen && _color != kColorLightGreen)
 		color_abc(kColorLightGreen);
-	if (hasName == 1 && menuScreen == 0)
+	if (_hasName && !_menuScreen)
 		centerText(textName, mouseX, mouseY);
-	if (menuScreen == 1)
+	if (_menuScreen)
 		showMenu();
-	else if (menuBar == 1)
+	else if (_menuBar)
 		clearMenu();
 }
 
@@ -449,7 +449,7 @@ void DrasculaEngine::playFLI(const char *filefli, int vel) {
 	// Open file
 	globalSpeed = 1000 / vel;
 	FrameSSN = 0;
-	UsingMem = 0;
+	_useMemForArj = false;
 	_arj.open(filefli);
 	mSession = TryInMem();
 	LastFrame = _system->getMillis();
@@ -459,7 +459,7 @@ void DrasculaEngine::playFLI(const char *filefli, int vel) {
 			term_int = 1;
 	}
 
-	if (UsingMem)
+	if (_useMemForArj)
 		free(memPtr);
 	else
 		_arj.close();
@@ -470,7 +470,7 @@ int DrasculaEngine::playFrameSSN() {
 	uint32 length;
 	byte *BufferSSN;
 
-	if (!UsingMem)
+	if (!_useMemForArj)
 		CHUNK = _arj.readByte();
 	else {
 		memcpy(&CHUNK, mSession, 1);
@@ -479,7 +479,7 @@ int DrasculaEngine::playFrameSSN() {
 
 	switch (CHUNK) {
 	case kFrameSetPal:
-		if (!UsingMem) {
+		if (!_useMemForArj) {
 			for (int i = 0; i < 256; i++) {
 				dacSSN[i * 3 + 0] = _arj.readByte();
 				dacSSN[i * 3 + 1] = _arj.readByte();
@@ -495,7 +495,7 @@ int DrasculaEngine::playFrameSSN() {
 		waitFrameSSN();
 		break;
 	case kFrameInit:
-		if (!UsingMem) {
+		if (!_useMemForArj) {
 			CMP = _arj.readByte();
 			length = _arj.readUint32LE();
 		} else {
@@ -506,7 +506,7 @@ int DrasculaEngine::playFrameSSN() {
 		}
 		if (CMP == kFrameCmpRle) {
 			BufferSSN = (byte *)malloc(length);
-			if (!UsingMem) {
+			if (!_useMemForArj) {
 				_arj.read(BufferSSN, length);
 			} else {
 				memcpy(BufferSSN, mSession, length);
@@ -525,7 +525,7 @@ int DrasculaEngine::playFrameSSN() {
 		} else {
 			if (CMP == kFrameCmpOff) {
 				BufferSSN = (byte *)malloc(length);
-				if (!UsingMem) {
+				if (!_useMemForArj) {
 					_arj.read(BufferSSN, length);
 				} else {
 					memcpy(BufferSSN, mSession, length);
@@ -565,7 +565,7 @@ byte *DrasculaEngine::TryInMem() {
 	if (memPtr == NULL)
 		return NULL;
 	_arj.read(memPtr, length);
-	UsingMem = 1;
+	_useMemForArj = true;
 	_arj.close();
 
 	return memPtr;
-- 
cgit v1.2.3