[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.84,1.85 vga.cpp,1.70,1.71
Travis Howell
kirben at users.sourceforge.net
Sun Jul 20 08:18:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv13098/simon
Modified Files:
items.cpp vga.cpp
Log Message:
Fix regression
Switch erros to warnings
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- items.cpp 20 Jul 2003 07:27:28 -0000 1.84
+++ items.cpp 20 Jul 2003 15:17:11 -0000 1.85
@@ -373,10 +373,15 @@
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 @@
}
break;
- case 82:{ /* dummy opcode? */
+ case 82:{ /* dummy opcode */
getVarOrByte();
}
break;
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- vga.cpp 16 Jul 2003 12:21:09 -0000 1.70
+++ vga.cpp 20 Jul 2003 15:17:11 -0000 1.71
@@ -1278,7 +1278,7 @@
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 @@
/* 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_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 @@
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 @@
/* 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 @@
/* 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) {
More information about the Scummvm-git-logs
mailing list