minor cleanup.

svn-id: r21189

6 files changed, 23 insertions, 23 deletions

diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp
index 508d764a9b..4fc76d264c 100644
--- a/engines/cine/bg.cpp
+++ b/engines/cine/bg.cpp
@@ -48,7 +48,7 @@ uint8 loadCt(const char *ctName) {
 	currentPtr = ptr = readBundleFile(findFileInBundle(ctName));
 
 	if (gameType == Cine::GID_OS) {
-		if (*(uint16 *) currentPtr == 0x800) {	// detect 256 color background
+		if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
 			loadCtHigh(currentPtr + 2);
 			return 0;
 		}
@@ -97,7 +97,7 @@ uint8 loadBg(const char *bgName) {
 
 	currentPtr = ptr = readBundleFile(fileIdx);
 
-	if (*(uint16 *) currentPtr == 0x800) {	// detect 256 color background
+	if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
 		loadBgHigh((char *)currentPtr + 2);
 		return 0;
 	}
@@ -139,7 +139,7 @@ void addBackground(char *bgName, uint16 bgIdx) {
 
 	additionalBgTable[bgIdx] = (uint8 *) malloc(320 * 200);
 
-	if (*(uint16 *) currentPtr == 0x800) {	// detect 256 color background
+	if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
 		memcpy(additionalBgTable[bgIdx], currentPtr + 2 + 3 * 256, 320 * 200);
 		return;
 	}
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index 5197ea5362..f703f89da5 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -93,14 +93,14 @@ void mainLoop(int bootScriptIdx) {
 	uint8 di;
 	uint16 mouseButton;
 
-	closeEngine3();
+	freeAnimDataTable();
 	resetMessageHead();
 	resetSeqList();
 	resetglobalScriptsHead();
 	resetObjectScriptHead();
 	mainLoopSub1();
 
-	mainLoopSub2(0, 0, 20, 200);
+	setTextWindow(0, 0, 20, 200);
 
 	errorVar = 0;
 
@@ -232,7 +232,7 @@ void mainLoop(int bootScriptIdx) {
 
 	hideMouse();
 	g_sfxPlayer->stop();
-	closeEngine3();
+	freeAnimDataTable();
 	unloadAllMasks();
 	freePrcLinkedList();
 	releaseObjectScripts();
diff --git a/engines/cine/object.h b/engines/cine/object.h
index c44db49767..23f2250e11 100644
--- a/engines/cine/object.h
+++ b/engines/cine/object.h
@@ -44,8 +44,8 @@ struct overlayHeadElement {
 	uint16 type;
 	int16 x;
 	int16 y;
-	int16 var10;
-	int16 var12;
+	int16 width;
+	int16 color;
 };
 
 #define NUM_MAX_OBJECT 255
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index 2bd8318d86..b96916a396 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -62,8 +62,8 @@ void addGfxElementA0(int16 param1, int16 param2) {
 
 	newElement->x = param2;
 	newElement->y = 0;
-	newElement->var10 = 0;
-	newElement->var12 = 0;
+	newElement->width = 0;
+	newElement->color = 0;
 
 	if (!currentHead)
 		currentHead = &overlayHead;
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 1251661679..cfd9fb46bd 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -63,13 +63,13 @@ Common::File partFileHandle;
 void waitPlayerInput(void) {
 }
 
-void closeEngine3(void) {
+void freeAnimDataTable(void) {
 }
 
 void mainLoopSub1(void) {
 }
 
-void mainLoopSub2(uint16 param1, uint16 param2, uint16 param3, uint16 param4) {
+void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4) {
 }
 
 uint16 errorVar;
@@ -422,8 +422,8 @@ void loadOverlayFromSave(Common::File *fHandle) {
 	newElement->type = fHandle->readUint16BE();
 	newElement->x = fHandle->readSint16BE();
 	newElement->y = fHandle->readSint16BE();
-	newElement->var10 = fHandle->readSint16BE();
-	newElement->var12 = fHandle->readSint16BE();
+	newElement->width = fHandle->readSint16BE();
+	newElement->color = fHandle->readSint16BE();
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;
@@ -472,7 +472,7 @@ int16 makeLoad(char *saveName) {
 	}
 
 	g_sfxPlayer->stop();
-	closeEngine3();
+	freeAnimDataTable();
 	unloadAllMasks();
 	freePrcLinkedList();
 	releaseObjectScripts();
@@ -861,8 +861,8 @@ void makeSave(char *saveFileName) {
 			fHandle.writeUint16BE(currentHead->type);
 			fHandle.writeSint16BE(currentHead->x);
 			fHandle.writeSint16BE(currentHead->y);
-			fHandle.writeSint16BE(currentHead->var10);
-			fHandle.writeSint16BE(currentHead->var12);
+			fHandle.writeSint16BE(currentHead->width);
+			fHandle.writeSint16BE(currentHead->color);
 
 			currentHead = currentHead->next;
 		}
@@ -2402,8 +2402,8 @@ void drawOverlays(void) {
 				messageIdx = currentOverlay->objIdx;
 				x = currentOverlay->x;
 				y = currentOverlay->y;
-				partVar1 = currentOverlay->var10;
-				partVar2 = currentOverlay->var12;
+				partVar1 = currentOverlay->width;
+				partVar2 = currentOverlay->color;
 
 				blitRawScreen(page1Raw);
 
@@ -2594,8 +2594,8 @@ void addMessage(uint8 param1, int16 param2, int16 param3, int16 param4, int16 pa
 
 	newElement->x = param2;
 	newElement->y = param3;
-	newElement->var10 = param4;
-	newElement->var12 = param5;
+	newElement->width = param4;
+	newElement->color = param5;
 
 	if (!currentHead)
 		currentHead = &overlayHead;
diff --git a/engines/cine/various.h b/engines/cine/various.h
index 809805fdda..eeba205116 100644
--- a/engines/cine/various.h
+++ b/engines/cine/various.h
@@ -83,9 +83,9 @@ extern Common::File palFileHandle;
 extern Common::File partFileHandle;
 
 void processPendingUpdates(int16 param);
-void closeEngine3(void);
+void freeAnimDataTable(void);
 void mainLoopSub1(void);
-void mainLoopSub2(uint16 param1, uint16 param2, uint16 param3, uint16 param4);
+void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4);
 
 extern uint16 errorVar;
 extern uint8 menuVar;