diff options
author | Strangerke | 2012-06-14 08:08:13 +0200 |
---|---|---|
committer | Strangerke | 2012-06-14 08:08:13 +0200 |
commit | d4e9aa78aba58ba96d99595410fd46dd351b8aca (patch) | |
tree | f681c889fd1dc3a3620c44871cda15a383e62dfd /engines/tony/mpal | |
parent | 42a322d671a27406a9dd993f82675dda0ee4780b (diff) | |
download | scummvm-rg350-d4e9aa78aba58ba96d99595410fd46dd351b8aca.tar.gz scummvm-rg350-d4e9aa78aba58ba96d99595410fd46dd351b8aca.tar.bz2 scummvm-rg350-d4e9aa78aba58ba96d99595410fd46dd351b8aca.zip |
TONY: Silent more CppCheck warnings
Diffstat (limited to 'engines/tony/mpal')
-rw-r--r-- | engines/tony/mpal/expr.cpp | 22 | ||||
-rw-r--r-- | engines/tony/mpal/mpal.cpp | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp index 516da98bb1..52751120f6 100644 --- a/engines/tony/mpal/expr.cpp +++ b/engines/tony/mpal/expr.cpp @@ -124,8 +124,8 @@ static byte *duplicateExpression(HGLOBAL h) { two->val.pson = duplicateExpression(two->val.son); } - one++; - two++; + ++one; + ++two; } globalUnlock(h); @@ -183,23 +183,23 @@ static void solve(LPEXPRESSION one, int num) { int j; while (num > 1) { - two=one + 1; + two = one + 1; if ((two->symbol == 0) || (one->symbol & 0xF0) <= (two->symbol & 0xF0)) { - two->val.num = Compute(one->val.num, two->val.num,one->symbol); + two->val.num = Compute(one->val.num, two->val.num, one->symbol); copyMemory(one, two, (num - 1) * sizeof(EXPRESSION)); - num--; + --num; } else { j = 1; three = two + 1; while ((three->symbol != 0) && (two->symbol & 0xF0) > (three->symbol & 0xF0)) { - two++; - three++; - j++; + ++two; + ++three; + ++j; } three->val.num = Compute(two->val.num, three->val.num, two->symbol); copyMemory(two, three, (num - j - 1) * sizeof(EXPRESSION)); - num--; + --num; } } } @@ -390,8 +390,8 @@ bool compareExpressions(HGLOBAL h1, HGLOBAL h2) { break; } - one++; - two++; + ++one; + ++two; } globalUnlock(h1); diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 3b798b8071..92ece3b0b4 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -1565,7 +1565,7 @@ void mpalFree() { * method that returns numeric results. */ uint32 mpalQueryDWORD(uint16 wQueryType, ...) { - int x, y, z; + int x, y; Common::String buf; uint32 dwRet = 0; char *n; @@ -1718,7 +1718,7 @@ uint32 mpalQueryDWORD(uint16 wQueryType, ...) { lockItems(); lockVar(); x = GETARG(uint32); - z = GETARG(uint32); + int z = GETARG(uint32); y = itemGetOrderFromNum(z); if (y != -1) { dwRet = doAction(x, y, GETARG(uint32)); |