diff options
Diffstat (limited to 'devtools')
-rw-r--r-- | devtools/create_hugo/create_hugo.cpp | 2 | ||||
-rw-r--r-- | devtools/create_hugo/staticdisplay.h | 2 | ||||
-rw-r--r-- | devtools/create_kyradat/extract.cpp | 2 | ||||
-rw-r--r-- | devtools/create_mads/main.cpp | 4 | ||||
-rw-r--r-- | devtools/create_mads/parser.cpp | 22 | ||||
-rw-r--r-- | devtools/skycpt/cptcompiler.cpp | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/devtools/create_hugo/create_hugo.cpp b/devtools/create_hugo/create_hugo.cpp index e54ade2b28..63b57f9c8f 100644 --- a/devtools/create_hugo/create_hugo.cpp +++ b/devtools/create_hugo/create_hugo.cpp @@ -743,7 +743,7 @@ int main(int argc, char *argv[]) { writeUint16BE(outFile, 0); writeUint16BE(outFile, kALnewscr_2d); writeUint16BE(outFile, 0); - + writeSByte(outFile, NUM_TUNES_1w); writeSByte(outFile, SILENCE_1w); writeSByte(outFile, TEST_SOUND_1w); diff --git a/devtools/create_hugo/staticdisplay.h b/devtools/create_hugo/staticdisplay.h index 03800017b5..99d155dc13 100644 --- a/devtools/create_hugo/staticdisplay.h +++ b/devtools/create_hugo/staticdisplay.h @@ -60,7 +60,7 @@ byte _palette[SIZE_PAL_ARRAY] = { V2, V2, V2 // BRIGHTWHITE }; #else -// Original paletter found in original exe. +// Original paletter found in original exe. // Currently disabled, because the result is quite ugly! // Color table of nearest standard 16 colors in system static palette #define C1 191 // Low intensity value diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 2b6499d3fb..5581dacec0 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -415,7 +415,7 @@ bool extractKyraForestSeqData(PAKFile &out, const ExtractInformation *info, cons const uint8 *src = data; uint8 *dst = buffer; const PatchEntry *patchPos = patchData; - + while (dst < (buffer + outsize)) { if ((dst - buffer) == patchPos->pos) { *dst++ = patchPos->val; diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index c5cd6d5b2e..aec9e45b8b 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -48,7 +48,7 @@ void link(const char *destFilename, char **srcFilenames, int srcCount) { fwrite(headerStr, 1, 4, destFile); for (int i = 0; i <= srcCount; ++i) fwrite(&v, 1, 4, destFile); - + // Set up buffer for copying void *tempBuffer = malloc(BUFFER_SIZE); @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) { // Change the extension strcpy(p, ".bin"); } - + // Compile the specified source file bool result = Compile(argv[1], destFilename); return result ? 0 : 1; diff --git a/devtools/create_mads/parser.cpp b/devtools/create_mads/parser.cpp index 0c6df43046..5df505e0df 100644 --- a/devtools/create_mads/parser.cpp +++ b/devtools/create_mads/parser.cpp @@ -44,7 +44,7 @@ enum CharCode { }; enum TokenCode { - NO_TOKEN, WORD, NUMBER, IDENTIFIER, END_OF_FILE, END_OF_LINE, + NO_TOKEN, WORD, NUMBER, IDENTIFIER, END_OF_FILE, END_OF_LINE, RW_DEFINE, RW_COLON, RW_SUB, RW_END, RW_OPCODE, ERROR }; @@ -58,7 +58,7 @@ struct Literal { union { int integer; } value; -}; +}; struct SymbolEntry { char symbol[MAX_TOKEN_STRING_LENGTH]; @@ -109,12 +109,12 @@ struct OpcodeEntry { }; OpcodeEntry OpcodeList[OP_DUP + 1] = { - {"HALT", OP_NO_PARAM}, {"IMM", OP_IMM_PARAM}, {"ZERO", OP_NO_PARAM}, {"ONE", OP_NO_PARAM}, - {"MINUSONE", OP_NO_PARAM}, {"STR", OP_IMM_PARAM}, {"DLOAD", OP_IMM_PARAM}, {"DSTORE", OP_IMM_PARAM}, + {"HALT", OP_NO_PARAM}, {"IMM", OP_IMM_PARAM}, {"ZERO", OP_NO_PARAM}, {"ONE", OP_NO_PARAM}, + {"MINUSONE", OP_NO_PARAM}, {"STR", OP_IMM_PARAM}, {"DLOAD", OP_IMM_PARAM}, {"DSTORE", OP_IMM_PARAM}, {"PAL", OP_IMM_PARAM}, {"LOAD", OP_IMM_PARAM}, {"GLOAD", OP_IMM_PARAM}, {"STORE", OP_IMM_PARAM}, {"GSTORE", OP_IMM_PARAM}, {"CALL", OP_IMM_PARAM}, {"LIBCALL", OP_IMM_PARAM}, {"RET", OP_NO_PARAM}, {"ALLOC", OP_IMM_PARAM}, {"JUMP", OP_TRANSFER_PARAM}, {"JMPFALSE", OP_TRANSFER_PARAM}, - {"JMPTRUE", OP_TRANSFER_PARAM}, {"EQUAL", OP_NO_PARAM}, {"LESS", OP_NO_PARAM}, + {"JMPTRUE", OP_TRANSFER_PARAM}, {"EQUAL", OP_NO_PARAM}, {"LESS", OP_NO_PARAM}, {"LEQUAL", OP_NO_PARAM}, {"NEQUAL", OP_NO_PARAM}, {"GEQUAL", OP_NO_PARAM}, {"GREAT", OP_NO_PARAM}, {"PLUS", OP_NO_PARAM}, {"MINUS", OP_NO_PARAM}, {"LOR", OP_NO_PARAM}, {"MULT", OP_NO_PARAM}, {"DIV", OP_IMM_PARAM}, {"MOD", OP_NO_PARAM}, @@ -418,7 +418,7 @@ void handle_define() { printf("Duplicate symbol encountered.\n"); token = ERROR; return; - } + } // Store the new symbol name strcpy(symbolTable[symbolCount].symbol, token_string); @@ -529,7 +529,7 @@ void handle_instruction() { printf("Incorrect opcode parameter encountered\n"); token = ERROR; return; - } + } // Apply the correct opcode size to the previously stored opcode and save the byte(s) if (literal.value.integer <= 0xff) { @@ -559,7 +559,7 @@ void handle_instruction() { printf("Incorrect opcode parameter encountered\n"); token = ERROR; return; - } + } // Check to see if it's a backward jump to an existing label int idx = jumpIndexOf(token_string); @@ -641,7 +641,7 @@ void handle_sub() { token = ERROR; return; } - + // If this is the first subroutine, start writing out the data if (subroutinesCount == 0) write_header(); @@ -681,7 +681,7 @@ void handle_sub() { // Save identifier, it's hopefully a jump symbol strcpy(jumpDests[jumpDestCount].name, token_string); get_token(); - if (token != RW_COLON) + if (token != RW_COLON) token = ERROR; else { // Save the jump point @@ -863,7 +863,7 @@ void get_special() { strToUpper(token_string); if (token_string[0] == '@') token = IDENTIFIER; - else if (!is_reserved_word()) + else if (!is_reserved_word()) token = ERROR; } diff --git a/devtools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp index 264646816c..f6ee926075 100644 --- a/devtools/skycpt/cptcompiler.cpp +++ b/devtools/skycpt/cptcompiler.cpp @@ -503,7 +503,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE * fwrite(&tmp, 2, 1, debOutf); tmp = 0; fwrite(&tmp, 2, 1, debOutf); - + printf("DEBUG Output File Position: 0x%08lX\r\n", ftell(debOutf)); printf("reset destination: %ld\n", ftell(debOutf)); for (int cnt = 0; cnt < 6; cnt++) { |