diff options
author | Max Horn | 2009-05-14 23:09:04 +0000 |
---|---|---|
committer | Max Horn | 2009-05-14 23:09:04 +0000 |
commit | a3efc5611c94a6295d00488b0210e5e568c78c50 (patch) | |
tree | 1ae000fa45c41982ac536fe176f0e207bd0966a9 /engines/agos | |
parent | 67ce8fee8545deae84bc7bc46a2c725e41c2e153 (diff) | |
download | scummvm-rg350-a3efc5611c94a6295d00488b0210e5e568c78c50.tar.gz scummvm-rg350-a3efc5611c94a6295d00488b0210e5e568c78c50.tar.bz2 scummvm-rg350-a3efc5611c94a6295d00488b0210e5e568c78c50.zip |
Fixed various GCC 4.2 warnings, among them an actual longstanding bug (3 years :) in the quicktime midi code
svn-id: r40577
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/script_pn.cpp | 4 | ||||
-rw-r--r-- | engines/agos/string.cpp | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index aec69e84c4..2dbd4e52fb 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -891,7 +891,9 @@ nln: _linct = ((*_linebase) & 127) - 1; } carryon: - while((x = doaction()) && !shouldQuit()); + do { + x = doaction(); + } while (x && !shouldQuit()); skipln: _linebase += 127 & *_linebase; _linembr++; diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 68860fe4f3..6f5fb391e5 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -916,7 +916,8 @@ uint32 AGOSEngine_PN::ftext(uint32 base, int n) { uint32 b = base; int ct = n; while (ct) { - while(_textBase[b++]); + while(_textBase[b++]) + ; ct--; } return b; @@ -927,7 +928,8 @@ char *AGOSEngine_PN::unctok(char *c, int n) { uint8 *tokbase; tokbase = _textBase + getlong(30); x = n; - while (x-=(*tokbase++ > 127)); + while (x-=(*tokbase++ > 127)) + ; while (*tokbase < 128) *c++=*tokbase++; *c++ = *tokbase & 127; @@ -1043,7 +1045,8 @@ void AGOSEngine_PN::patok(int n) { uint8 *tokbase; tokbase = _textBase + getlong(30); x = n; - while (x -= (*tokbase++ > 127)); + while (x -= (*tokbase++ > 127)) + ; while (*tokbase < 128) pcf(*tokbase++); pcf((uint8)(*tokbase & 127)); |