[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.6,1.7 simon.cpp,1.49,1.50 verb.cpp,1.6,1.7

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv6748/simon

Modified Files:
	items.cpp simon.cpp verb.cpp 
Log Message:

Minor simon code cleanup


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- items.cpp	4 Nov 2002 06:46:21 -0000	1.6
+++ items.cpp	5 Nov 2002 02:34:05 -0000	1.7
@@ -1108,7 +1108,7 @@
 
 		case 181:{
 				o_force_lock();
-				if (_game == GAME_SIMON2WIN || _game == GAME_SIMON2DOS) {
+				if (_game & GAME_SIMON2) {
 					fcs_unk_2(1);
 					showMessageFormat("\xC");
 				}

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- simon.cpp	5 Nov 2002 02:17:38 -0000	1.49
+++ simon.cpp	5 Nov 2002 02:34:05 -0000	1.50
@@ -913,7 +913,7 @@
 
 uint SimonState::loadTextFile(const char *filename, byte *dst)
 {
-	if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS))
+	if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
 		return loadTextFile_simon1(filename, dst);
 	else
 		return loadTextFile_gme(filename, dst);
@@ -921,7 +921,7 @@
 
 File *SimonState::openTablesFile(const char *filename)
 {
-	if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS))
+	if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
 		return openTablesFile_simon1(filename);
 	else
 		return openTablesFile_gme(filename);
@@ -929,7 +929,7 @@
 
 void SimonState::closeTablesFile(File *in)
 {
-	if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS))
+	if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
 		closeTablesFile_simon1(in);
 	else
 		closeTablesFile_gme(in);
@@ -1071,7 +1071,7 @@
 {
 	HitArea *last;
 
-	if ((_game == GAME_SIMON2WIN) || (_game == GAME_SIMON2DOS)) {
+	if (_game & GAME_SIMON2) {
 		_mouse_cursor = 0;
 		if (_hitarea_unk_4 != 999) {
 			_mouse_cursor = 9;
@@ -4056,7 +4056,7 @@
 
 void SimonState::read_vga_from_datfile_1(uint vga_id)
 {
-	if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS)) {
+	if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
 		File in;
 		char buf[50];
 		uint32 size;
@@ -4088,7 +4088,7 @@
 
 byte *SimonState::read_vga_from_datfile_2(uint id)
 {
-	if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS)) {
+	if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
 		File in;
 		char buf[50];
 		uint32 size;
@@ -4132,7 +4132,7 @@
 
 void SimonState::openGameFile()
 {
-	if ((_game != GAME_SIMON1DEMO) && (_game != GAME_SIMON1DOS)) {
+	if (_game != GAME_SIMON1DEMO && _game != GAME_SIMON1DOS) {
 		_game_file = new File();
 		_game_file->open(gss->gme_filename, _gameDataPath);
 

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- verb.cpp	2 Nov 2002 09:38:43 -0000	1.6
+++ verb.cpp	5 Nov 2002 02:34:05 -0000	1.7
@@ -53,7 +53,7 @@
 	HitArea *last;
 	HitArea *ha;
 
-	if ((_game == GAME_SIMON2WIN) || (_game == GAME_SIMON2DOS)) {
+	if (_game & GAME_SIMON2) {
 		if (_bit_array[4] & 0x8000) {
 			o_unk_120(202);
 			_last_hitarea_2_ptr = NULL;
@@ -113,7 +113,7 @@
 {
 	FillOrCopyStruct *fcs;
 
-	if ((_game == GAME_SIMON2WIN) || (_game == GAME_SIMON2DOS)) {
+	if (_game & GAME_SIMON2) {
 		if (_bit_array[4] & 0x8000)
 			return;
 	}