[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.104,1.105

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv29846/simon

Modified Files:
	items.cpp 
Log Message:

Don't use bug work around on simon1dos, since copy protection screen causes odd effects.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- items.cpp	12 Dec 2003 03:19:39 -0000	1.104
+++ items.cpp	18 Dec 2003 09:04:13 -0000	1.105
@@ -384,9 +384,9 @@
 						_speechid_array_4[var] = speech_id;
 					}
 				} else {
-					if (var < 20)
-						_stringid_array_3_backup[var] = _stringid_array_3[var];
+					if (var < 20) {
 						_stringid_array_3[var] = string_id;
+					}
 				}
 			}
 			break;
@@ -936,7 +936,7 @@
 				_show_preposition = true;
 				o_setup_cond_c();
 				_show_preposition = false;
-				if (!(_game & GF_SIMON2))
+				if (!(_game & GF_SIMON2) && (_game & GF_TALKIE))
 					_reset_arrays = true;
 			}
 			break;