diff options
| author | Travis Howell | 2003-10-21 11:41:33 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-21 11:41:33 +0000 |
| commit | c3deeb3daf5ef009fe678b8c7ec0ede8047084ec (patch) | |
| tree | d987aabfb14b354264467876b6682f1688e1c8bc /simon/items.cpp | |
| parent | e4813cfab53916f996b2610b58436a2aac939e85 (diff) | |
| download | scummvm-rg350-c3deeb3daf5ef009fe678b8c7ec0ede8047084ec.tar.gz scummvm-rg350-c3deeb3daf5ef009fe678b8c7ec0ede8047084ec.tar.bz2 scummvm-rg350-c3deeb3daf5ef009fe678b8c7ec0ede8047084ec.zip | |
Correctly reanem var this time.
svn-id: r10929
Diffstat (limited to 'simon/items.cpp')
| -rw-r--r-- | simon/items.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index c0a00f14dd..34951fb70b 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -527,20 +527,20 @@ int SimonEngine::runScript() { case 98:{ /* start vga */ if (!(_game & GF_SIMON2)) { - uint b = getVarOrWord(); - uint c = getVarOrByte(); - uint d = getVarOrWord(); - uint e = getVarOrWord(); - uint f = getVarOrWord(); - start_vga_code(c, b / 100, b, d, e, f); + uint vga_sprite_id = getVarOrWord(); + uint b = getVarOrByte(); + uint x = getVarOrWord(); + uint y = getVarOrWord(); + uint base_color = getVarOrWord(); + start_vga_code(b, vga_sprite_id / 100, vga_sprite_id, x, y, base_color); } else { - uint a = getVarOrWord(); - uint b = getVarOrWord(); - uint c = getVarOrByte(); - uint d = getVarOrWord(); - uint e = getVarOrWord(); - uint f = getVarOrWord(); - start_vga_code(c, a, b, d, e, f); + uint vga_res = getVarOrWord(); + uint vga_sprite_id = getVarOrWord(); + uint b = getVarOrByte(); + uint x = getVarOrWord(); + uint y = getVarOrWord(); + uint base_color = getVarOrWord(); + start_vga_code(b, vga_res, vga_sprite_id, x, y, base_color); } } break; @@ -726,9 +726,9 @@ int SimonEngine::runScript() { break; case 130:{ /* set script cond */ - uint a = getVarOrByte(); + uint var = getVarOrByte(); getNextWord(); - if (a == 1) + if (var == 1) _script_cond_b = getNextWord(); else _script_cond_c = getNextWord(); |