aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/create_kyradat/create_kyradat.cpp60
-rw-r--r--tools/create_kyradat/create_kyradat.h2
-rw-r--r--tools/create_kyradat/extract.cpp54
3 files changed, 58 insertions, 58 deletions
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 23c0f5fd97..c9ed94881a 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -42,25 +42,25 @@ enum {
#include "misc.h"
-bool extractRaw(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractStrings10(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractShapes(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractAmigaSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractWdSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-
-bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-
-bool extractStringsWoSuffix(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractPaddedStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractRaw16to8(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractRaw32(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
-bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
+bool extractRaw(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractStrings10(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractShapes(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractAmigaSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractWdSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+
+bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+
+bool extractStringsWoSuffix(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractPaddedStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractRaw16to8(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractRaw32(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
+bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
void createFilename(char *dstFilename, const int gid, const int lang, const int special, const char *filename);
void createLangFilename(char *dstFilename, const int gid, const int lang, const int special, const char *filename);
@@ -1208,27 +1208,7 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
if (list && list->findEntry(filename) != 0)
continue;
- int patch = 0;
- if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) {
- // FM Towns files that need addional patches
- if (id == kTakenStrings || id == kNoDropStrings || id == kPoisonGoneString ||
- id == kThePoisonStrings || id == kFluteStrings || id == kWispJewelStrings)
- patch = 1;
- else if (id == kIntroStrings || id == kKyra1TownsSFXwdTable)
- patch = 2;
- }
-
- if (g->special == k2TownsFile1E || g->special == k2TownsFile1J) {
- if (id == k2SeqplayStrings)
- patch = 3;
- }
-
- if (g->special == k2FloppyFile2) {
- if (id == k2IngamePakFiles)
- patch = 4;
- }
-
- if (!tDesc->extract(out, g, data + i->second.offset, i->second.data.size, filename, patch)) {
+ if (!tDesc->extract(out, g, data + i->second.offset, i->second.data.size, filename, id, UNK_LANG)) {
fprintf(stderr, "ERROR: couldn't extract id %d\n", id);
return false;
}
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index e64f278109..cb1afcb454 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -380,7 +380,7 @@ enum kExtractType {
struct ExtractType {
int type;
- bool (*extract)(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch);
+ bool (*extract)(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang);
void (*createFilename)(char *dstFilename, const int gid, const int lang, const int special, const char *filename);
};
diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp
index 7584ef7093..1e27211d80 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/tools/create_kyradat/extract.cpp
@@ -23,7 +23,7 @@
#include "create_kyradat.h"
-bool extractRaw(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractRaw(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
uint8 *buffer = new uint8[size];
assert(buffer);
memcpy(buffer, data, size);
@@ -31,7 +31,27 @@ bool extractRaw(PAKFile &out, const Game *g, const byte *data, const uint32 size
return out.addFile(filename, buffer, size);
}
-bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
+ int fmtPatch = 0;
+ if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) {
+ // FM Towns files that need addional patches
+ if (id == kTakenStrings || id == kNoDropStrings || id == kPoisonGoneString ||
+ id == kThePoisonStrings || id == kFluteStrings || id == kWispJewelStrings)
+ fmtPatch = 1;
+ else if (id == kIntroStrings)
+ fmtPatch = 2;
+ }
+
+ if (g->special == k2TownsFile1E || g->special == k2TownsFile1J) {
+ if (id == k2SeqplayStrings)
+ fmtPatch = 3;
+ }
+
+ if (g->special == k2FloppyFile2) {
+ if (id == k2IngamePakFiles)
+ fmtPatch = 4;
+ }
+
uint32 entries = 0;
uint32 targetsize = size + 4;
for (uint32 i = 0; i < size; ++i) {
@@ -187,7 +207,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
return out.addFile(filename, buffer, targetsize);
}
-bool extractStrings10(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractStrings10(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
const int strSize = 10;
uint32 entries = (size + (strSize - 1)) / strSize;
uint32 targetSize = 4;
@@ -208,7 +228,7 @@ bool extractStrings10(PAKFile &out, const Game *g, const byte *data, const uint3
return out.addFile(filename, buffer, output - buffer);
}
-bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
// different entry size for the FM-TOWNS version
const int roomEntrySize = (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) ? (0x69) : ((g->special == kAmigaVersion) ? 0x52 : 0x51);
const int countRooms = size / roomEntrySize;
@@ -240,7 +260,7 @@ bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 si
return out.addFile(filename, buffer, countRooms * 9 + 4);
}
-bool extractShapes(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractShapes(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
byte *buffer = new byte[size + 1 * 4];
assert(buffer);
byte *output = buffer;
@@ -252,7 +272,7 @@ bool extractShapes(PAKFile &out, const Game *g, const byte *data, const uint32 s
return out.addFile(filename, buffer, size + 1 * 4);
}
-bool extractAmigaSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractAmigaSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
const uint32 entries = size / 8;
byte *buffer = new byte[entries * 6 + 1 * 4];
@@ -271,7 +291,7 @@ bool extractAmigaSfx(PAKFile &out, const Game *g, const byte *data, const uint32
return out.addFile(filename, buffer, entries * 6 + 1 * 4);
}
-bool extractWdSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractWdSfx(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
const int bufferSize = 0x12602;
uint8 *buffer = new uint8[0x12602];
@@ -287,7 +307,7 @@ int extractHofSeqData_checkString(const void *ptr, uint8 checkSize);
int extractHofSeqData_isSequence(const void *ptr, const Game *g, uint32 maxCheckSize);
int extractHofSeqData_isControl(const void *ptr, uint32 size);
-bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int numSequences = 0;
int numNestedSequences = 0;
@@ -573,7 +593,7 @@ int extractHofSeqData_isControl(const void *ptr, uint32 size) {
return 1;
}
-bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = 1;
uint8 *buffer = new uint8[size + 1];
const uint8 *src = data;
@@ -602,7 +622,7 @@ bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, co
return out.addFile(filename, buffer, outsize);
}
-bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = 1;
uint8 *buffer = new uint8[size + 1];
const uint8 *src = data;
@@ -641,7 +661,7 @@ bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, co
return out.addFile(filename, buffer, outsize);
}
-bool extractStringsWoSuffix(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractStringsWoSuffix(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = size + 4;
uint8 *buffer = new uint8[outsize];
const uint8 *src = data;
@@ -670,7 +690,7 @@ bool extractStringsWoSuffix(PAKFile &out, const Game *g, const byte *data, const
return out.addFile(filename, buffer, outsize);
}
-bool extractPaddedStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractPaddedStrings(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = size + 4;
uint8 *buffer = new uint8[outsize];
const uint8 *src = data;
@@ -694,7 +714,7 @@ bool extractPaddedStrings(PAKFile &out, const Game *g, const byte *data, const u
return out.addFile(filename, buffer, outsize);
}
-bool extractRaw16to8(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractRaw16to8(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = size >> 1;
uint8 *buffer = new uint8[outsize];
const uint8 *src = data;
@@ -708,7 +728,7 @@ bool extractRaw16to8(PAKFile &out, const Game *g, const byte *data, const uint32
return out.addFile(filename, buffer, outsize);
}
-bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
uint8 *buffer = new uint8[size];
const uint8 *src = data;
uint8 *dst = buffer;
@@ -722,7 +742,7 @@ bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 si
return out.addFile(filename, buffer, size);
}
-bool extractRaw32(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractRaw32(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
uint8 *buffer = new uint8[size];
const uint8 *src = data;
uint8 *dst = buffer;
@@ -736,7 +756,7 @@ bool extractRaw32(PAKFile &out, const Game *g, const byte *data, const uint32 si
return out.addFile(filename, buffer, size);
}
-bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int num = size / 22;
uint8 *buffer = new uint8[size];
uint32 outsize = num * 18;
@@ -767,7 +787,7 @@ bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const u
return out.addFile(filename, buffer, outsize);
}
-bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
+bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int id, int lang) {
int outsize = 1;
uint8 *buffer = new uint8[size + 1];
const uint8 *src2 = data;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 16:37:47 +0000