diff options
| author | Florian Kagerer | 2009-10-18 12:47:54 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-10-18 12:47:54 +0000 |
| commit | 8b993ce86381352e022641896fd28f3472f083bf (patch) | |
| tree | 9fb883eefc29ae356cd22403cb6a47167139ddb2 /engines/kyra/items_lol.cpp | |
| parent | 0fd3a2f842bfee04b9423ee683445d98189369c6 (diff) | |
| download | scummvm-rg350-8b993ce86381352e022641896fd28f3472f083bf.tar.gz scummvm-rg350-8b993ce86381352e022641896fd28f3472f083bf.tar.bz2 scummvm-rg350-8b993ce86381352e022641896fd28f3472f083bf.zip | |
LOL: this should fix a valgrind warning
svn-id: r45221
Diffstat (limited to 'engines/kyra/items_lol.cpp')
| -rw-r--r-- | engines/kyra/items_lol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index d65fe5e28e..5b566d51db 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -245,7 +245,7 @@ ItemInPlay *LoLEngine::findObject(uint16 index) { return &_itemsInPlay[index]; } -void LoLEngine::runItemScript(int charNum, int item, int sub, int next, int reg4) { +void LoLEngine::runItemScript(int charNum, int item, int flags, int next, int reg4) { EMCState scriptState; memset(&scriptState, 0, sizeof(EMCState)); @@ -256,14 +256,14 @@ void LoLEngine::runItemScript(int charNum, int item, int sub, int next, int reg4 _emc->init(&scriptState, &_itemScript); _emc->start(&scriptState, func); - scriptState.regs[0] = sub; + scriptState.regs[0] = flags; scriptState.regs[1] = charNum; scriptState.regs[2] = item; scriptState.regs[3] = next; scriptState.regs[4] = reg4; if (_emc->isValid(&scriptState)) { - if (*(scriptState.ip - 1) & sub) { + if (*(scriptState.ip - 1) & flags) { while (_emc->isValid(&scriptState)) _emc->run(&scriptState); } |