[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.380,1.381 vga.cpp,1.100,1.101

[Travis Howell]

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

Modified Files:
	simon.cpp vga.cpp 
Log Message:

Simpler check


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- simon.cpp	20 Dec 2003 04:25:01 -0000	1.380
+++ simon.cpp	20 Dec 2003 04:34:24 -0000	1.381
@@ -1735,7 +1735,8 @@
 		ha->unk3 = 1;
 
 		// Simon1 specific
-		_keep_arrows = 1;
+		if (!(_game & GF_WIN))
+			_keep_arrows = 1;
 		o_kill_sprite_simon1(0x80);
 		start_vga_code(0, 1, 0x80, 0, 0, 0xE);
 	} else {

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- vga.cpp	20 Dec 2003 04:29:17 -0000	1.100
+++ vga.cpp	20 Dec 2003 04:34:24 -0000	1.101
@@ -1195,8 +1195,7 @@
 	VgaSprite *vsp = find_cur_sprite();
 	// Work around to allow inventory arrows to be
 	// showned in some versions of Simon the Sorcerer 1
-	if (!(_game & GF_SIMON2) && !(_game & GF_WIN) &&
-	      vsp->id == 0x80 && _keep_arrows) {
+	if (vsp->id == 0x80 && _keep_arrows) {
 		_keep_arrows = 0;
 		return;
 	}