diff options
author | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
---|---|---|
committer | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
commit | 84063dc9727a9f55e09d39574027beab695680e6 (patch) | |
tree | d71a9599cb550d9f7949a2d3209574064e054d85 /devtools/create_toon | |
parent | c6e89df3d940747a85d447f172e2323c800f5eaf (diff) | |
parent | a39a3eda46aea108a51556f001617ad28d29e520 (diff) | |
download | scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.gz scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.bz2 scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.zip |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'devtools/create_toon')
-rw-r--r-- | devtools/create_toon/create_toon.cpp | 7 | ||||
-rw-r--r-- | devtools/create_toon/create_toon.h | 6 | ||||
-rw-r--r-- | devtools/create_toon/staticdata.h | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index bdd57be7df..2cf8895d4b 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -77,8 +77,8 @@ int main(int argc, char *argv[]) { writeByte(outFile, TOON_DAT_VER_MAJ); writeByte(outFile, TOON_DAT_VER_MIN); - // game versions/variantes - writeUint16BE(outFile, NUM_VARIANTE); + // game versions/variants + writeUint16BE(outFile, NUM_VARIANTS); // Write locationDirNotVisited nbrElem = sizeof(locationDirNotVisited_EN) / sizeof(char *); @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) { nbrElem = sizeof(specialInfoLine_SP) / sizeof(char *); writeTextArray(outFile, specialInfoLine_SP, nbrElem); -// Not yet handled : miscTexts, endingLine and exitLine. Are they useful? + // Not yet handled: miscTexts, endingLine and exitLine. Are they useful? fclose(outFile); return 0; @@ -160,4 +160,3 @@ void writeTextArray(FILE *outFile, const char *textArray[], int nbrText) { fwrite(padBuf, pad, 1, outFile); } } - diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h index 60b33013f4..b047959215 100644 --- a/devtools/create_toon/create_toon.h +++ b/devtools/create_toon/create_toon.h @@ -30,9 +30,9 @@ #define TOON_DAT_VER_MAJ 0 // 1 byte #define TOON_DAT_VER_MIN 3 // 1 byte -// Number of Variante of the game. For the moment, it's the same -// than the number of languages -#define NUM_VARIANTE 5 +// Number of variants of the game. For the moment, it's the same +// as the number of languages +#define NUM_VARIANTS 5 typedef unsigned char uint8; typedef unsigned char byte; diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index 2164512337..bc49c7adaf 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -318,4 +318,3 @@ const char *exitLine_RU = "Hope you enjoyed playing ToonStruck!!"; const char* exitLine_SP = "\255\255Esperamos que te diviertas jugando a ToonStruck!!"; #endif - |