diff options
| author | Max Horn | 2009-01-29 05:26:12 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-29 05:26:12 +0000 |
| commit | ac59693be26b4239aaaf380896a1e1b753172546 (patch) | |
| tree | b64a9b664917ed86e78e90560b034f0b1ee49054 /engines/scumm | |
| parent | a0a82d911c77b63f2069dbc39ab26394fe4d377d (diff) | |
| download | scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.tar.gz scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.tar.bz2 scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.zip | |
A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/akos.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/script_v5.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/string.cpp | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index 1777caa84c..39de31b5c9 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -1730,7 +1730,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con if (code2 & 0x80) code2 = READ_BE_UINT16(aksq + curpos); - if((code2 & 0xC000) == 0xC000 && code2 != AKC_ComplexChan && code2 != AKC_Return && code2 != AKC_EndSeq && code2 != AKC_C08E && code2 != AKC_ComplexChan2 && code2 != AKC_C021 && code2 != AKC_C022) + if ((code2 & 0xC000) == 0xC000 && code2 != AKC_ComplexChan && code2 != AKC_Return && code2 != AKC_EndSeq && code2 != AKC_C08E && code2 != AKC_ComplexChan2 && code2 != AKC_C021 && code2 != AKC_C022) error("Ending with undefined uSweat token %X", code2); a->_cost.curpos[chan] = curpos; diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index ce5ac4f323..a50dde5271 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -2064,7 +2064,8 @@ void ScummEngine_v5::o5_roomOps() { a = getVarOrDirectByte(PARAM_1); s = filename; - while ((*s++ = fetchScriptByte())); + while ((*s++ = fetchScriptByte())) + ; file = _saveFileMan->openForSaving(filename); if (file != NULL) { @@ -2083,7 +2084,8 @@ void ScummEngine_v5::o5_roomOps() { a = getVarOrDirectByte(PARAM_1); s = filename; - while ((*s++ = fetchScriptByte())); + while ((*s++ = fetchScriptByte())) + ; file = _saveFileMan->openForLoading(filename); if (file != NULL) { diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 00521048a1..3b3611ab50 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -1126,11 +1126,13 @@ int ScummEngine_v72he::convertMessageToString(const byte *msg, byte *dst, int ds // (pickup4) // (PU1) // (PU2) - while (src[num++] != ')'); + while (src[num++] != ')') + ; continue; } if ((_game.features & GF_HE_LOCALIZED) && chr == '[') { - while (src[num++] != ']'); + while (src[num++] != ']') + ; continue; } |