Change GF_AMIGAS back to GF_AMIGA

svn-id: r8510

2 files changed, 12 insertions, 12 deletions

diff --git a/simon/intern.h b/simon/intern.h
index fbe5b17800..c7f07b72ef 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -140,7 +140,7 @@ enum {
 	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 @@ enum {
 	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
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 6ce91b1bc8..c6e31cab75 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1156,21 +1156,21 @@ File *SimonEngine::openTablesFile_simon1(const char *filename) {
 }
 
 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 @@ uint SimonEngine::item_get_icon_number(Item *item) {
 
 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::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
 }
 
 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 @@ void SimonEngine::read_vga_from_datfile_1(uint vga_id) {
 }
 
 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::resfile_read(void *dst, uint32 offs, uint32 size) {
 }
 
 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 @@ void SimonEngine::go() {
 		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 @@ void SimonEngine::loadMusic (uint music) {
 		_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);