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

[buddha_ at users.sourceforge.net]

Revision: 33785
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33785&view=rev
Author:   buddha_
Date:     2008-08-11 21:45:47 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
Changed palPtr from a pointer to a Common::Array named palArray. Removed palEntriesCount variable as it's now equivalent to palArray.size().

Modified Paths:
--------------
    scummvm/trunk/engines/cine/cine.cpp
    scummvm/trunk/engines/cine/pal.cpp
    scummvm/trunk/engines/cine/pal.h

Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp	2008-08-11 21:26:41 UTC (rev 33784)
+++ scummvm/trunk/engines/cine/cine.cpp	2008-08-11 21:45:47 UTC (rev 33785)
@@ -73,8 +73,6 @@
 		freeErrmessDat();
 	}
 	Common::clearAllSpecialDebugLevels();
-
-	free(palPtr);
 }
 
 int CineEngine::init() {

Modified: scummvm/trunk/engines/cine/pal.cpp
===================================================================
--- scummvm/trunk/engines/cine/pal.cpp	2008-08-11 21:26:41 UTC (rev 33784)
+++ scummvm/trunk/engines/cine/pal.cpp	2008-08-11 21:45:47 UTC (rev 33785)
@@ -28,10 +28,7 @@
 
 namespace Cine {
 
-uint16 palEntriesCount;
-
-PalEntry *palPtr = NULL;
-
+Common::Array<PalEntry> palArray;
 static byte paletteBuffer1[16];
 static byte paletteBuffer2[16];
 
@@ -41,27 +38,20 @@
 	removeExtention(buffer, fileName);
 
 	strcat(buffer, ".PAL");
+	palArray.clear();
 
-	if (palPtr) {
-		free(palPtr);
-		palPtr = NULL;
-	}
-
-	palEntriesCount = 0;
-
 	Common::File palFileHandle;
 	if (!palFileHandle.open(buffer))
 		error("loadPal(): Cannot open file %s", fileName);
 
-	palEntriesCount = palFileHandle.readUint16LE();
+	uint16 palEntriesCount = palFileHandle.readUint16LE();	
 	palFileHandle.readUint16LE(); // entry size
 
-	palPtr = (PalEntry *)malloc(palEntriesCount * sizeof(PalEntry));
-	assert(palPtr);
-	for (int i = 0; i < palEntriesCount; ++i) {
-		palFileHandle.read(palPtr[i].name, 10);
-		palFileHandle.read(palPtr[i].pal1, 16);
-		palFileHandle.read(palPtr[i].pal2, 16);
+	palArray.resize(palEntriesCount);
+	for (uint i = 0; i < palArray.size(); ++i) {
+		palFileHandle.read(palArray[i].name, 10);
+		palFileHandle.read(palArray[i].pal1, 16);
+		palFileHandle.read(palArray[i].pal2, 16);
 	}
 	palFileHandle.close();
 }
@@ -81,8 +71,8 @@
 		position++;
 	}
 
-	for (i = 0; i < palEntriesCount; i++) {
-		if (!strcmp(buffer, palPtr[i].name)) {
+	for (i = 0; i < palArray.size(); i++) {
+		if (!strcmp(buffer, palArray[i].name)) {
 			return i;
 		}
 	}
@@ -105,9 +95,9 @@
 			paletteBuffer1[i] = paletteBuffer2[i] = (i << 4) + i;
 		}
 	} else {
-		assert(paletteIndex < palEntriesCount);
-		memcpy(paletteBuffer1, palPtr[paletteIndex].pal1, 16);
-		memcpy(paletteBuffer2, palPtr[paletteIndex].pal2, 16);
+		assert(paletteIndex < (int32)palArray.size());
+		memcpy(paletteBuffer1, palArray[paletteIndex].pal1, 16);
+		memcpy(paletteBuffer2, palArray[paletteIndex].pal2, 16);
 	}
 }
 

Modified: scummvm/trunk/engines/cine/pal.h
===================================================================
--- scummvm/trunk/engines/cine/pal.h	2008-08-11 21:26:41 UTC (rev 33784)
+++ scummvm/trunk/engines/cine/pal.h	2008-08-11 21:45:47 UTC (rev 33785)
@@ -34,7 +34,7 @@
 	byte pal2[16];
 };
 
-extern PalEntry *palPtr;
+extern Common::Array<PalEntry> palArray;
 
 void loadPal(const char *fileName);
 


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