[Scummvm-cvs-logs] SF.net SVN: scummvm: [21189] scummvm/trunk/engines/cine

[cyx at users.sourceforge.net]

Revision: 21189
Author:   cyx
Date:     2006-03-09 15:02:29 -0800 (Thu, 09 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21189&view=rev

Log Message:
-----------
minor cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/bg.cpp
    scummvm/trunk/engines/cine/main_loop.cpp
    scummvm/trunk/engines/cine/object.h
    scummvm/trunk/engines/cine/script.cpp
    scummvm/trunk/engines/cine/various.cpp
    scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/bg.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg.cpp	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/bg.cpp	2006-03-09 23:02:29 UTC (rev 21189)
@@ -48,7 +48,7 @@
 	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 @@
 
 	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 @@
 
 	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;
 	}

Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/main_loop.cpp	2006-03-09 23:02:29 UTC (rev 21189)
@@ -93,14 +93,14 @@
 	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 @@
 
 	hideMouse();
 	g_sfxPlayer->stop();
-	closeEngine3();
+	freeAnimDataTable();
 	unloadAllMasks();
 	freePrcLinkedList();
 	releaseObjectScripts();

Modified: scummvm/trunk/engines/cine/object.h
===================================================================
--- scummvm/trunk/engines/cine/object.h	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/object.h	2006-03-09 23:02:29 UTC (rev 21189)
@@ -44,8 +44,8 @@
 	uint16 type;
 	int16 x;
 	int16 y;
-	int16 var10;
-	int16 var12;
+	int16 width;
+	int16 color;
 };
 
 #define NUM_MAX_OBJECT 255

Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/script.cpp	2006-03-09 23:02:29 UTC (rev 21189)
@@ -62,8 +62,8 @@
 
 	newElement->x = param2;
 	newElement->y = 0;
-	newElement->var10 = 0;
-	newElement->var12 = 0;
+	newElement->width = 0;
+	newElement->color = 0;
 
 	if (!currentHead)
 		currentHead = &overlayHead;

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/various.cpp	2006-03-09 23:02:29 UTC (rev 21189)
@@ -63,13 +63,13 @@
 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 @@
 	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 @@
 	}
 
 	g_sfxPlayer->stop();
-	closeEngine3();
+	freeAnimDataTable();
 	unloadAllMasks();
 	freePrcLinkedList();
 	releaseObjectScripts();
@@ -861,8 +861,8 @@
 			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 @@
 				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 @@
 
 	newElement->x = param2;
 	newElement->y = param3;
-	newElement->var10 = param4;
-	newElement->var12 = param5;
+	newElement->width = param4;
+	newElement->color = param5;
 
 	if (!currentHead)
 		currentHead = &overlayHead;

Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h	2006-03-09 22:57:38 UTC (rev 21188)
+++ scummvm/trunk/engines/cine/various.h	2006-03-09 23:02:29 UTC (rev 21189)
@@ -83,9 +83,9 @@
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.