From 4fbfe1741c63fa3101003f9fcbc991589f5efc91 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 21 Nov 2009 03:45:25 +0000 Subject: Cleanup. svn-id: r46032 --- tools/create_kyradat/create_kyradat.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index dbeadb51f0..3ed69e2218 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -415,10 +415,10 @@ byte getSpecialID(int special) { 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 @@ Index parseIndex(const uint8 *data, uint32 size) { 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 @@ bool updateIndex(PAKFile &out, const Game *g) { 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 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) { } } - if (!updateIndex(out, g)) { + if (!updateIndex(out, &extractInfo)) { error("couldn't update INDEX file, stop processing of all files"); return false; } -- cgit v1.2.3