aboutsummaryrefslogtreecommitdiff
path: root/tools/create_kyradat
diff options
context:
space:
mode:
Diffstat (limited to 'tools/create_kyradat')
-rw-r--r--tools/create_kyradat/create_kyradat.cpp30
-rw-r--r--tools/create_kyradat/hof_cd.h2
-rw-r--r--tools/create_kyradat/hof_demo.h2
-rw-r--r--tools/create_kyradat/misc.h4
4 files changed, 19 insertions, 19 deletions
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index c69c38199a..456da29fa0 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -91,7 +91,7 @@ const ExtractType extractTypeTable[] = {
{ k2TypeShpDataV1, extractHofShapeAnimDataV1, createFilename },
{ k2TypeShpDataV2, extractHofShapeAnimDataV2, createFilename },
{ k2TypeSoundList, extractStringsWoSuffix, createFilename },
- { k2TypeLangSoundList, extractStringsWoSuffix, createLangFilename },
+ { k2TypeLangSoundList, extractStringsWoSuffix, createLangFilename },
{ k2TypeSfxList, extractPaddedStrings, createFilename },
{ k3TypeRaw16to8, extractRaw16to8, createFilename },
{ k3TypeShpData, extractMrShapeAnimData, createFilename },
@@ -239,7 +239,7 @@ const ExtractFilename extractFilenames[] = {
{ k2IngameCDA, kTypeRawData, "I_TRACKS.CDA" },
{ k2IngameTalkObjIndex, kTypeRawData, "I_TALKOBJECTS.MAP" },
{ k2IngameTimJpStrings, kTypeStringList, "I_TIMJPSTR.TXT" },
- { k2IngameItemAnimData, k2TypeShpDataV2, "I_INVANIM.SHP" },
+ { k2IngameItemAnimData, k2TypeShpDataV2, "I_INVANIM.SHP" },
{ k2IngameTlkDemoStrings, kTypeLanguageList, "I_TLKDEMO.TXT" },
@@ -295,7 +295,7 @@ bool getFilename(char *dstFilename, const Game *g, const int id) {
void createFilename(char *dstFilename, const int gid, const int lang, const int special, const char *filename) {
strcpy(dstFilename, filename);
- static const char *gidExtensions[] = { "", ".K2", ".K3", 0, ".LOL" };
+ static const char *gidExtensions[] = { "", ".K2", ".K3", 0, ".LOL" };
strcat(dstFilename, gidExtensions[gid]);
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -318,7 +318,7 @@ void createLangFilename(char *dstFilename, const int gid, const int lang, const
}
}
- static const char *gidExtensions[] = { "", ".K2", ".K3", 0, ".LOL" };
+ static const char *gidExtensions[] = { "", ".K2", ".K3", 0, ".LOL" };
strcat(dstFilename, gidExtensions[gid]);
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -633,7 +633,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
uint16 relOffs = (uint16) (output - buffer);
WRITE_BE_UINT16(hdout, relOffs);
hdout++;
-
+
WRITE_BE_UINT16(output, READ_LE_UINT16(ptr)); // flags
ptr += 2;
output += 2;
@@ -683,9 +683,9 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
extractHofSeqData_isControl(ctrStart, ctrSize)) {
controlOffs = (uint16) (output - buffer);
*output++ = ctrSize >> 2;
-
+
for (int cc = 0; cc < ctrSize; cc += 2)
- WRITE_BE_UINT16(output + cc, READ_LE_UINT16(ctrStart + cc)); // frame control
+ WRITE_BE_UINT16(output + cc, READ_LE_UINT16(ctrStart + cc)); // frame control
output += ctrSize;
}
}
@@ -708,7 +708,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
ptr += 2;
output += 2;
- // endFrame
+ // endFrame
WRITE_BE_UINT16(output, (ctrSize && ((ctrSize >> 2) < READ_LE_UINT16(ptr))) ? (ctrSize >> 2) : READ_LE_UINT16(ptr));
ptr += 2;
output += 2;
@@ -717,7 +717,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
WRITE_BE_UINT16(output, READ_LE_UINT16(ptr));
ptr += 2;
output += 2;
-
+
ptr += 4;
for (int w = 0; w < 2; w++) { //x, y
@@ -744,7 +744,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
memset(output, 0, 4);
output += 4;
}
-
+
if (g->special == k2TownsFile1E)
ptr += 2;
@@ -891,7 +891,7 @@ bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, co
src += 4;
dst += 2;
outsize += 4;
-
+
for (int j = 0; j < 20; j++) {
WRITE_BE_UINT16(dst, READ_LE_UINT16(src));
src += 2;
@@ -923,12 +923,12 @@ bool extractHofShapeAnimDataV2(PAKFile &out, const Game *g, const byte *data, co
WRITE_BE_UINT16(dst, READ_LE_UINT16(src));
src += 2;
dst += 2;
-
+
uint8 numFrames = *src;
*dst++ = numFrames;
src += 6;
outsize += 3;
-
+
for (int i = 0; i < (numFrames << 1); i++) {
WRITE_BE_UINT16(dst, READ_LE_UINT16(src));
src += 2;
@@ -1030,12 +1030,12 @@ bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const
WRITE_BE_UINT16(dst, READ_LE_UINT16(src1));
src1 += 2;
dst += 2;
-
+
uint8 numFrames = *src1;
*dst++ = numFrames;
src1 += 10;
outsize += 3;
-
+
for (int i = 0; i < (numFrames << 1); i++) {
WRITE_BE_UINT16(dst, READ_LE_UINT16(src2));
src2 += 2;
diff --git a/tools/create_kyradat/hof_cd.h b/tools/create_kyradat/hof_cd.h
index 431adbb674..1530a04e9f 100644
--- a/tools/create_kyradat/hof_cd.h
+++ b/tools/create_kyradat/hof_cd.h
@@ -54,7 +54,7 @@ const Game kyra2TalkieGames[] = {
{ kKyra2, FR_FRA, k2CDFile2F, "e20d0d2e500f01e399ec588247a7e213", kyra2File2CDF},
{ kKyra2, DE_DEU, k2CDFile2G, "e20d0d2e500f01e399ec588247a7e213", kyra2File2CDG},
- // Italian Fan Translation (using same offsets as English)
+ // Italian Fan Translation (using same offsets as English)
{ kKyra2, IT_ITA, k2CDFile1I, "130795aa8f2333250c895dae9028b9bb", kyra2File1CDI},
GAME_DUMMY_ENTRY
diff --git a/tools/create_kyradat/hof_demo.h b/tools/create_kyradat/hof_demo.h
index 2eaaa3c413..b239f63780 100644
--- a/tools/create_kyradat/hof_demo.h
+++ b/tools/create_kyradat/hof_demo.h
@@ -26,7 +26,7 @@ const Game kyra2Demos[] = {
{ kKyra2, EN_ANY, k2DemoVersion, "a620a37579dd44ab0403482285e3897f", kyra2Demo},
{ kKyra2, EN_ANY, k2CDFile2E, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDE},
{ kKyra2, FR_FRA, k2CDFile2F, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDF},
- { kKyra2, DE_DEU, k2CDFile2G, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDG},
+ { kKyra2, DE_DEU, k2CDFile2G, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDG},
GAME_DUMMY_ENTRY
};
diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h
index f0de5283ad..c519418d37 100644
--- a/tools/create_kyradat/misc.h
+++ b/tools/create_kyradat/misc.h
@@ -536,13 +536,13 @@ const SpecialExtension specialTable[] = {
{ k2CDFile2E, "CD" },
{ k2CDFile2F, "CD" },
{ k2CDFile2G, "CD" },
-
+
{ k2TownsFile1E, "TNS" },
{ k2TownsFile1J, "TNS" },
{ k2TownsFile2E, "TNS" },
{ k2TownsFile2J, "TNS" },
{ k2DemoVersion, "DEM" },
- { k2DemoLol, "DEM" },
+ { k2DemoLol, "DEM" },
{ -1, 0 }
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:40:40 +0000