[Scummvm-cvs-logs] SF.net SVN: scummvm:[46032] scummvm/trunk/tools/create_kyradat/ create_kyradat.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Nov 21 04:45:27 CET 2009


Revision: 46032
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46032&view=rev
Author:   lordhoto
Date:     2009-11-21 03:45:25 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-11-21 00:37:54 UTC (rev 46031)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-11-21 03:45:25 UTC (rev 46032)
@@ -415,10 +415,10 @@
 
 typedef uint16 GameDef;
 
-GameDef createGameDef(const Game *g) {
-	return ((getGameID(g->game) & 0xF) << 12) |
-	       ((getPlatformID(g->platform) & 0xF) << 8) |
-	       ((getSpecialID(g->special) & 0xF) << 4);
+GameDef createGameDef(const ExtractInformation *eI) {
+	return ((getGameID(eI->game) & 0xF) << 12) |
+	       ((getPlatformID(eI->platform) & 0xF) << 8) |
+	       ((getSpecialID(eI->special) & 0xF) << 4);
 }
 
 struct Index {
@@ -453,7 +453,7 @@
 	return result;
 }
 
-bool updateIndex(PAKFile &out, const Game *g) {
+bool updateIndex(PAKFile &out, const ExtractInformation *eI) {
 	uint32 size = 0;
 	const uint8 *data = out.getFileData("INDEX", &size);
 
@@ -461,7 +461,7 @@
 	if (data)
 		index = parseIndex(data, size);
 
-	GameDef gameDef = createGameDef(g);
+	GameDef gameDef = createGameDef(eI);
 	if (index.version == kKyraDatVersion) {
 		if (std::find(index.gameList.begin(), index.gameList.end(), gameDef) == index.gameList.end()) {
 			++index.includedGames;
@@ -1243,7 +1243,7 @@
 		}
 	}
 
-	if (!updateIndex(out, g)) {
+	if (!updateIndex(out, &extractInfo)) {
 		error("couldn't update INDEX file, stop processing of all files");
 		return false;
 	}


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




More information about the Scummvm-git-logs mailing list