thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change GF_AMIGAS back to GF_AMIGA

Browse source 
svn-id: r8510
This commit is contained in:
Travis Howell 2003-06-15 14:07:53 +00:00
parent e6455a9dd2
commit 81eeff479d
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
simon/intern.h
View file

@ -140,7 +140,7 @@ enum {
GF_TALKIE = 1 << 2, GF_TALKIE = 1 << 2,
GF_DEMO = 1 << 3, GF_DEMO = 1 << 3,
GF_MAC = 1 << 4, 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 { enum {
@ -152,8 +152,8 @@ enum {
GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE, GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
GAME_SIMON1DEMO = GF_DEMO, GAME_SIMON1DEMO = GF_DEMO,
GAME_SIMON2MAC = GF_SIMON2 | GF_WIN | GF_TALKIE | GF_MAC, GAME_SIMON2MAC = GF_SIMON2 | GF_WIN | GF_TALKIE | GF_MAC,
GAME_SIMON1AMIGA = GF_AMIGAS, GAME_SIMON1AMIGA = GF_AMIGA,
GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGAS GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGA
}; };
#endif #endif

18
simon/simon.cpp
View file

@ -1156,21 +1156,21 @@ File *SimonEngine::openTablesFile_simon1(const char *filename) {
} }
uint SimonEngine::loadTextFile(const char *filename, byte *dst) { 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); return loadTextFile_simon1(filename, dst);
else else
return loadTextFile_gme(filename, dst); return loadTextFile_gme(filename, dst);
} }
File *SimonEngine::openTablesFile(const char *filename) { 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); return openTablesFile_simon1(filename);
else else
return openTablesFile_gme(filename); return openTablesFile_gme(filename);
} }
void SimonEngine::closeTablesFile(File *in) { 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(); in->close();
delete in; delete in;
} }
@ -1642,7 +1642,7 @@ uint SimonEngine::item_get_icon_number(Item *item) {
void SimonEngine::loadIconFile() { void SimonEngine::loadIconFile() {
File in; File in;
if (_game & GF_AMIGAS) if (_game & GF_AMIGA)
in.open("icon.pkd", _gameDataPath); in.open("icon.pkd", _gameDataPath);
else else
in.open("ICON.DAT", _gameDataPath); 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) { 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; File in;
char buf[50]; char buf[50];
uint32 size; 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) { 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; File in;
char buf[50]; char buf[50];
uint32 size; uint32 size;
@ -4109,7 +4109,7 @@ void SimonEngine::resfile_read(void *dst, uint32 offs, uint32 size) {
} }
void SimonEngine::openGameFile() { 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 = new File();
_game_file->open(gss->gme_filename, _gameDataPath); _game_file->open(gss->gme_filename, _gameDataPath);
@ -4336,7 +4336,7 @@ void SimonEngine::go() {
gss = &simon2win_settings; gss = &simon2win_settings;
} else if (_game == GAME_SIMON2DOS) { } else if (_game == GAME_SIMON2DOS) {
gss = &simon2dos_settings; gss = &simon2dos_settings;
} else if (_game & GF_AMIGAS) { } else if (_game & GF_AMIGA) {
gss = &simon1amiga_settings; gss = &simon1amiga_settings;
} else if (_game == GAME_SIMON1DEMO) { } else if (_game == GAME_SIMON1DEMO) {
gss = &simon1demo_settings; gss = &simon1demo_settings;
@ -4715,7 +4715,7 @@ void SimonEngine::loadMusic (uint music) {
_last_music_played = music; _last_music_played = music;
_next_music_to_play = -1; _next_music_to_play = -1;
} else { // Simon 1 music } else { // Simon 1 music
if (_game & GF_AMIGAS) { if (_game & GF_AMIGA) {
if (_game != GAME_SIMON1CD32) { if (_game != GAME_SIMON1CD32) {
// TODO Add support for decruncher // TODO Add support for decruncher
warning("playMusic - Decrunch %dtune attempt", music); warning("playMusic - Decrunch %dtune attempt", music);