diff options
author | Travis Howell | 2003-07-20 15:17:11 +0000 |
---|---|---|
committer | Travis Howell | 2003-07-20 15:17:11 +0000 |
commit | 82f90bb6cf061159e5d86ef408c5e1d657088b81 (patch) | |
tree | dde70d1691dfb63a9a41ab320b72bd1e586fed2d /simon | |
parent | 1b646cd845bca812dec5d6dcc25300a4be6875c6 (diff) | |
download | scummvm-rg350-82f90bb6cf061159e5d86ef408c5e1d657088b81.tar.gz scummvm-rg350-82f90bb6cf061159e5d86ef408c5e1d657088b81.tar.bz2 scummvm-rg350-82f90bb6cf061159e5d86ef408c5e1d657088b81.zip |
Fix regression
Switch erros to warnings
svn-id: r9092
Diffstat (limited to 'simon')
-rw-r--r-- | simon/items.cpp | 15 | ||||
-rw-r--r-- | simon/vga.cpp | 14 |
2 files changed, 17 insertions, 12 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index e282fdc513..dea3c4d59d 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -373,10 +373,15 @@ int SimonEngine::runScript() { case 67:{ /* set array 3 and 4 */ uint var = getVarOrByte(); uint string_id = getNextStringID(); - if (var < 20) { - _stringid_array_3[var] = string_id; - if (_game & GF_TALKIE) - _array_4[var] = getNextWord(); + if (_game & GF_TALKIE) { + uint value = getNextWord(); + if (var < 20) { + _stringid_array_3[var] = string_id; + _array_4[var] = value; + } + } else { + if (var < 20) + _stringid_array_3[var] = string_id; } } break; @@ -436,7 +441,7 @@ int SimonEngine::runScript() { } break; - case 82:{ /* dummy opcode? */ + case 82:{ /* dummy opcode */ getVarOrByte(); } break; diff --git a/simon/vga.cpp b/simon/vga.cpp index fa6ef79606..84f4fa00ac 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1278,7 +1278,7 @@ void SimonEngine::vc_27_reset() { void SimonEngine::vc_28_dummy_op() { /* dummy opcode */ _vc_ptr += 8; - error("vc_28 - Please report error message and where in game it occured"); + warning("vc_28 - Please report error message and where in game it occured"); } void SimonEngine::vc_29_stop_all_sounds() { @@ -1326,7 +1326,7 @@ void SimonEngine::vc_35() { /* not used? */ _vc_ptr += 4; _vga_sprite_changed++; - error("vc_35 - Please report error message and where in game it occured"); + warning("vc_35 - Please report error message and where in game it occured"); } void SimonEngine::vc_36_saveload_thing() { @@ -1532,13 +1532,13 @@ void SimonEngine::vc_52_play_sound() { void SimonEngine::vc_53_no_op() { /* dummy op in simon1dos/talkie */ /* no op in simon1win */ - error("vc_53 - Please report error message and where in game it occured"); + warning("vc_53 - Please report error message and where in game it occured"); } void SimonEngine::vc_54_no_op() { /* dummy op in simon1dos/talkie */ /* no op in simon1win */ - error("vc_54 - Please report error message and where in game it occured"); + warning("vc_54 - Please report error message and where in game it occured"); } void SimonEngine::vc_55_offset_hit_area() { @@ -1573,7 +1573,7 @@ void SimonEngine::vc_56() { add_vga_timer(num + gss->VGA_DELAY_BASE, _vc_ptr, _vga_cur_sprite_id, _vga_cur_file_id); _vc_ptr = (byte *)&vc_get_out_of_code; } else { - error("vc_56 - Please report error message and where in game it occured"); + warning("vc_56 - Please report error message and where in game it occured"); } } @@ -1596,7 +1596,7 @@ void SimonEngine::vc_58() { /* no op in simon1dos */ /* not used in simon1win? */ if (!(_game & GF_SIMON2)) - error("vc_58 - Please report error message and where in game it occured"); + warning("vc_58 - Please report error message and where in game it occured"); uint sprite = _vga_cur_sprite_id; uint file = _vga_cur_file_id; byte *vc_ptr; @@ -1620,7 +1620,7 @@ void SimonEngine::vc_57_no_op() { /* unknown function in simon1dos/simon2dos */ /* no op in simon1win/simon2win */ /* not used? */ - error("vc_57 - Please report error message and where in game it occured"); + warning("vc_57 - Please report error message and where in game it occured"); } void SimonEngine::vc_kill_sprite(uint file, uint sprite) { |