[Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.17,1.18 simon.cpp,1.244,1.245

Travis Howell kirben at users.sourceforge.net
Sun Jun 15 07:08:15 CEST 2003


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

Modified Files:
	intern.h simon.cpp 
Log Message:

Change GF_AMIGAS back to GF_AMIGA


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- intern.h	20 May 2003 14:43:22 -0000	1.17
+++ intern.h	15 Jun 2003 14:07:52 -0000	1.18
@@ -140,7 +140,7 @@
 	GF_TALKIE = 1 << 2,
 	GF_DEMO   = 1 << 3,
 	GF_MAC    = 1 << 4,
-	GF_AMIGAS = 1 << 5 // rename to GF_AMIGA once the scumm GF_* have been removed from gameDetector.h
+	GF_AMIGA = 1 << 5
 };
 
 enum {
@@ -152,8 +152,8 @@
 	GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
 	GAME_SIMON1DEMO = GF_DEMO,
 	GAME_SIMON2MAC =  GF_SIMON2 | GF_WIN | GF_TALKIE | GF_MAC,
-	GAME_SIMON1AMIGA = GF_AMIGAS,
-	GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGAS
+	GAME_SIMON1AMIGA = GF_AMIGA,
+	GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGA
 };
 
 #endif

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- simon.cpp	15 Jun 2003 13:07:06 -0000	1.244
+++ simon.cpp	15 Jun 2003 14:07:53 -0000	1.245
@@ -1156,21 +1156,21 @@
 }
 
 uint SimonEngine::loadTextFile(const char *filename, byte *dst) {
-	if (_game & GF_AMIGAS || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
+	if (_game & GF_AMIGA || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
 		return loadTextFile_simon1(filename, dst);
 	else
 		return loadTextFile_gme(filename, dst);
 }
 
 File *SimonEngine::openTablesFile(const char *filename) {
-	if (_game & GF_AMIGAS || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
+	if (_game & GF_AMIGA || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS)
 		return openTablesFile_simon1(filename);
 	else
 		return openTablesFile_gme(filename);
 }
 
 void SimonEngine::closeTablesFile(File *in) {
-	if (_game & GF_AMIGAS || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
+	if (_game & GF_AMIGA || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
 		in->close();
 		delete in;
 	}
@@ -1642,7 +1642,7 @@
 
 void SimonEngine::loadIconFile() {
 	File in;
-	if (_game & GF_AMIGAS)
+	if (_game & GF_AMIGA)
 		in.open("icon.pkd", _gameDataPath);
 	else
 		in.open("ICON.DAT", _gameDataPath);
@@ -4024,7 +4024,7 @@
 }
 
 void SimonEngine::read_vga_from_datfile_1(uint vga_id) {
-	if (_game & GF_AMIGAS || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
+	if (_game & GF_AMIGA || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
 		File in;
 		char buf[50];
 		uint32 size;
@@ -4061,7 +4061,7 @@
 }
 
 byte *SimonEngine::read_vga_from_datfile_2(uint id) {
-	if (_game & GF_AMIGAS || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
+	if (_game & GF_AMIGA || _game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
 		File in;
 		char buf[50];
 		uint32 size;
@@ -4109,7 +4109,7 @@
 }
 
 void SimonEngine::openGameFile() {
-	if (!(_game & GF_AMIGAS) && _game != GAME_SIMON1DEMO && _game != GAME_SIMON1DOS) {
+	if (!(_game & GF_AMIGA) && _game != GAME_SIMON1DEMO && _game != GAME_SIMON1DOS) {
 		_game_file = new File();
 		_game_file->open(gss->gme_filename, _gameDataPath);
 
@@ -4336,7 +4336,7 @@
 		gss = &simon2win_settings;
 	} else if (_game == GAME_SIMON2DOS) {
 		gss = &simon2dos_settings;
-	} else if (_game & GF_AMIGAS) {
+	} else if (_game & GF_AMIGA) {
 		gss = &simon1amiga_settings;
 	} else if (_game == GAME_SIMON1DEMO) {
 		gss = &simon1demo_settings;
@@ -4715,7 +4715,7 @@
 		_last_music_played = music;
 		_next_music_to_play = -1;
 	} else { // Simon 1 music
-		if (_game & GF_AMIGAS) {
+		if (_game & GF_AMIGA) {
 			if (_game != GAME_SIMON1CD32) {
 				// TODO Add support for decruncher
 				warning("playMusic - Decrunch %dtune attempt", music);





More information about the Scummvm-git-logs mailing list