[Scummvm-cvs-logs] SF.net SVN: scummvm: [32522] tools/trunk

[lordhoto at users.sourceforge.net]

Revision: 32522
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32522&view=rev
Author:   lordhoto
Date:     2008-06-03 17:02:48 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
Fixed compilation on systems without uint defined (thanks to clone2727 for spotting it).

Modified Paths:
--------------
    tools/trunk/compress_kyra.cpp
    tools/trunk/kyra_pak.cpp

Modified: tools/trunk/compress_kyra.cpp
===================================================================
--- tools/trunk/compress_kyra.cpp	2008-06-03 21:20:55 UTC (rev 32521)
+++ tools/trunk/compress_kyra.cpp	2008-06-04 00:02:48 UTC (rev 32522)
@@ -422,8 +422,8 @@
 	uint32 resOffset;
 };
 
-static const DuplicatedFile *findDuplicatedFile(uint32 resOffset, const DuplicatedFile *list, const uint maxEntries) {
-	for (uint i = 0; i < maxEntries; ++i) {
+static const DuplicatedFile *findDuplicatedFile(uint32 resOffset, const DuplicatedFile *list, const uint32 maxEntries) {
+	for (uint32 i = 0; i < maxEntries; ++i) {
 		if (list[i].resOffset == resOffset && list[i].resOffset != 0)
 			return &list[i];
 	}
@@ -459,7 +459,7 @@
 		DuplicatedFile *red = new DuplicatedFile[files];
 		memset(red, 0, sizeof(DuplicatedFile)*files);
 
-		for (uint i = 0; i < files; ++i) {
+		for (uint16 i = 0; i < files; ++i) {
 			uint32 resFilename = readUint32LE(input);
 			uint32 resOffset = readUint32LE(input);
 

Modified: tools/trunk/kyra_pak.cpp
===================================================================
--- tools/trunk/kyra_pak.cpp	2008-06-03 21:20:55 UTC (rev 32521)
+++ tools/trunk/kyra_pak.cpp	2008-06-04 00:02:48 UTC (rev 32522)
@@ -282,7 +282,7 @@
 		if (magic != MKID_BE('SCVM'))
 			error("LINKLIST file does not contain 'SCVM' header");
 		uint32 links = READ_BE_UINT32(src); src += 4;
-		for (uint i = 0; i < links; ++i) {
+		for (uint32 i = 0; i < links; ++i) {
 			const char *linksTo = (const char *)src;
 
 			if (!_fileList->findEntry(linksTo))
@@ -290,7 +290,7 @@
 			src += strlen(linksTo) + 1;
 
 			uint32 sources = READ_BE_UINT32(src); src += 4;
-			for (uint j = 0; j < sources; ++j) {
+			for (uint32 j = 0; j < sources; ++j) {
 				LinkList *newEntry = new LinkList;
 				assert(newEntry);
 


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