diff options
author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /tools/skycpt | |
parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'tools/skycpt')
-rw-r--r-- | tools/skycpt/KmpSearch.cpp | 8 | ||||
-rw-r--r-- | tools/skycpt/ReadMe.txt | 2 | ||||
-rw-r--r-- | tools/skycpt/cptcompiler.cpp | 12 | ||||
-rw-r--r-- | tools/skycpt/idFinder.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/tools/skycpt/KmpSearch.cpp b/tools/skycpt/KmpSearch.cpp index 93318de15e..c70a0a77d8 100644 --- a/tools/skycpt/KmpSearch.cpp +++ b/tools/skycpt/KmpSearch.cpp @@ -41,11 +41,11 @@ __declspec(naked) void __fastcall KmpSearch::init(const char *subStr) { lea edi, [ecx + KmpSearch::_subStr] // this + 0x100 lea ebx, [ecx + KmpSearch::_retarget] // this lea ebp, [ecx + 1] - + mov byte ptr [ebx], -1 xor eax, eax - + loopStart: shr ecx, 8 test al, 3 @@ -107,7 +107,7 @@ __declspec(naked) char * __fastcall KmpSearch::search(const char *str) { jz short endOfString // goto endOfString xor edx, edx // index - + mov cl, 3 searchLoop: shr eax, 8 @@ -117,7 +117,7 @@ __declspec(naked) char * __fastcall KmpSearch::search(const char *str) { lodsd xor cl, cl skipRead: - + test al, al jz short endOfString diff --git a/tools/skycpt/ReadMe.txt b/tools/skycpt/ReadMe.txt index f66c4f9f4f..396f9c3080 100644 --- a/tools/skycpt/ReadMe.txt +++ b/tools/skycpt/ReadMe.txt @@ -44,7 +44,7 @@ If you still want to waste your time by creating this file: 9) Rename this file to SKY.CPT. 10) DELETE IT BECAUSE IT'S PROBABLY BROKEN, NOT WORTH BOTHERING WITH ANYWAYS AND DOWNLOAD THE SKY.CPT FILE FROM THE URL ABOVE!! - + Oh, I almost forgot. The program only works on little endian systems and probably isn't alignment safe either. It may also leak memory or accidentially reformat your harddisk. Who knows. diff --git a/tools/skycpt/cptcompiler.cpp b/tools/skycpt/cptcompiler.cpp index 326390ce8d..0572bc1537 100644 --- a/tools/skycpt/cptcompiler.cpp +++ b/tools/skycpt/cptcompiler.cpp @@ -244,7 +244,7 @@ void processSymlinks(FILE *inf, CptObj *destArr, uint16 *baseLists) { assertEmpty(from); dlinkNames[dlinkCount] = (char*)malloc(strlen(cptName) + 1); strcpy(dlinkNames[dlinkCount], cptName); - + dofgets(line, 1024, inf); assert((line[0] == '\t') && (line[1] == '\t') && (line[2] == '-') && (line[3] == '>')); char *stopCh; @@ -256,7 +256,7 @@ void processSymlinks(FILE *inf, CptObj *destArr, uint16 *baseLists) { dlinks[dlinkCount * 2 + 1] = destId; dlinkCount++; - + dofgets(line, 1024, inf); assert(isEndOfObject(line, "SYMLINK", fromId)); } else @@ -303,7 +303,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE * if (resCpts[id].data || resCpts[id].dbgName || resCpts[id].len) dataListLen[cnt] = elemCnt + 1; } - + // write the header uint32 rev = 0; fwrite(&rev, 2, 1, debOutf); @@ -432,7 +432,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE * pos++; diff[diffDest++] = (uint16)strtoul(pos, &pos, 16); } - assert(diff[diffDest - 1] == 0xFFFF); + assert(diff[diffDest - 1] == 0xFFFF); diffNo++; } } @@ -457,7 +457,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE * else { saveIds[numIds] = resId; numIds++; - } + } } printf("%d saveIds\n", numIds); fwrite(&numIds, 2, 1, debOutf); @@ -481,7 +481,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE * printf("File %s not found\n", inName); } } - + if (filesExist) { FILE *res288 = fopen("RESET.288", "rb"); fseek(res288, 0, SEEK_END); diff --git a/tools/skycpt/idFinder.cpp b/tools/skycpt/idFinder.cpp index 70452363e1..e97dd7d6fe 100644 --- a/tools/skycpt/idFinder.cpp +++ b/tools/skycpt/idFinder.cpp @@ -35,7 +35,7 @@ uint16 findCptId(char *name, TextFile *cptFile) { cLine = cptFile->findLine(kmp, cLine); if (cLine >= 0) { char *line = cptFile->giveLine(cLine); - if ((strncmp(line, "COMPACT::", 9) == 0) || + if ((strncmp(line, "COMPACT::", 9) == 0) || (strncmp(line, "SCRATCH::", 9) == 0) || (strncmp(line, "GET_TOS::", 9) == 0)) { char *stopCh; |