diff options
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 70 | ||||
-rw-r--r-- | engines/agos/charset.cpp | 43 | ||||
-rw-r--r-- | engines/agos/cursor.cpp | 13 | ||||
-rw-r--r-- | engines/agos/intern.h | 5 |
4 files changed, 7 insertions, 124 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 76e4378982..aa927b1dcd 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -37,21 +37,10 @@ #include "sound/mididrv.h" #include "sound/mods/protracker.h" -#ifdef PALMOS_68K -#include "globals.h" -#endif - using Common::File; namespace AGOS { -#ifdef PALMOS_68K -#define PTR(a) a -static const GameSpecificSettings *simon1_settings; -static const GameSpecificSettings *simon2_settings; -static const GameSpecificSettings *feeblefiles_settings; -#else -#define PTR(a) &a static const GameSpecificSettings simon1_settings = { "EFFECTS", // effects_filename "SIMON", // speech_filename @@ -71,8 +60,6 @@ static const GameSpecificSettings puzzlepack_settings = { "", // effects_filename "MUSIC", // speech_filename }; -#endif - AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system) : AGOSEngine_Feeble(system) { @@ -692,13 +679,9 @@ static const uint16 initialVideoWindows_Common[20] = { }; void AGOSEngine_PuzzlePack::setupGame() { - gss = PTR(puzzlepack_settings); + gss = &puzzlepack_settings; _numVideoOpcodes = 85; -#ifndef PALMOS_68K _vgaMemSize = 7500000; -#else - _vgaMemSize = gVars->memory[kMemSimon2Games]; -#endif _itemMemSize = 20000; _tableMemSize = 200000; _frameCount = 1; @@ -713,13 +696,9 @@ void AGOSEngine_PuzzlePack::setupGame() { } void AGOSEngine_Feeble::setupGame() { - gss = PTR(feeblefiles_settings); + gss = &feeblefiles_settings; _numVideoOpcodes = 85; -#ifndef PALMOS_68K _vgaMemSize = 7500000; -#else - _vgaMemSize = gVars->memory[kMemSimon2Games]; -#endif _itemMemSize = 20000; _tableMemSize = 200000; _frameCount = 1; @@ -736,14 +715,12 @@ void AGOSEngine_Feeble::setupGame() { } void AGOSEngine_Simon2::setupGame() { - gss = PTR(simon2_settings); + gss = &simon2_settings; _tableIndexBase = 1580 / 4; _textIndexBase = 1500 / 4; _numVideoOpcodes = 75; #if defined(__DS__) _vgaMemSize = 1300000; -#elif defined(PALMOS_68K) - _vgaMemSize = gVars->memory[kMemSimon2Games]; #else _vgaMemSize = 2000000; #endif @@ -772,15 +749,11 @@ void AGOSEngine_Simon2::setupGame() { } void AGOSEngine_Simon1::setupGame() { - gss = PTR(simon1_settings); + gss = &simon1_settings; _tableIndexBase = 1576 / 4; _textIndexBase = 1460 / 4; _numVideoOpcodes = 64; -#ifndef PALMOS_68K _vgaMemSize = 1000000; -#else - _vgaMemSize = gVars->memory[kMemSimon1Games]; -#endif _itemMemSize = 20000; _tableMemSize = 50000; _musicIndexBase = 1316 / 4; @@ -802,13 +775,9 @@ void AGOSEngine_Simon1::setupGame() { } void AGOSEngine_Waxworks::setupGame() { - gss = PTR(simon1_settings); + gss = &simon1_settings; _numVideoOpcodes = 64; -#ifndef PALMOS_68K _vgaMemSize = 1000000; -#else - _vgaMemSize = gVars->memory[kMemSimon1Games]; -#endif _itemMemSize = 80000; _tableMemSize = 50000; _frameCount = 4; @@ -826,13 +795,9 @@ void AGOSEngine_Waxworks::setupGame() { } void AGOSEngine_Elvira2::setupGame() { - gss = PTR(simon1_settings); + gss = &simon1_settings; _numVideoOpcodes = 60; -#ifndef PALMOS_68K _vgaMemSize = 1000000; -#else - _vgaMemSize = gVars->memory[kMemSimon1Games]; -#endif _itemMemSize = 64000; _tableMemSize = 100000; _frameCount = 4; @@ -849,13 +814,9 @@ void AGOSEngine_Elvira2::setupGame() { } void AGOSEngine_Elvira1::setupGame() { - gss = PTR(simon1_settings); + gss = &simon1_settings; _numVideoOpcodes = 57; -#ifndef PALMOS_68K _vgaMemSize = 1000000; -#else - _vgaMemSize = gVars->memory[kMemSimon1Games]; -#endif _itemMemSize = 64000; _tableMemSize = 256000; _frameCount = 4; @@ -1094,20 +1055,3 @@ void AGOSEngine::shutdown() { } } // End of namespace AGOS - -#ifdef PALMOS_68K -#include "scumm_globals.h" - -_GINIT(AGOS_AGOS) -_GSETPTR(AGOS::simon1_settings, GBVARS_SIMON1SETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS) -_GSETPTR(AGOS::simon2_settings, GBVARS_SIMON2SETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS) -_GSETPTR(AGOS::feeblefiles_settings, GBVARS_FEEBLEFILESSETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS) -_GEND - -_GRELEASE(AGOS_AGOS) -_GRELEASEPTR(GBVARS_SIMON1SETTINGS_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_SIMON2SETTINGS_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_FEEBLEFILESSETTINGS_INDEX, GBVARS_AGOS) -_GEND - -#endif diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp index 5286b65732..68eb2d7ac8 100644 --- a/engines/agos/charset.cpp +++ b/engines/agos/charset.cpp @@ -749,22 +749,6 @@ void AGOSEngine::windowScroll(WindowBlock *window) { _lockWord &= ~0x8000; } -#ifdef PALMOS_68K -static const byte *feeble_windowFont; -static const byte *czech_simonFont; -static const byte *russian_simonFont; -static const byte *polish_simonFont; -static const byte *french_simonFont; -static const byte *german_simonFont; -static const byte *hebrew_simonFont; -static const byte *italian_simonFont; -static const byte *spanish_simonFont; -static const byte *english_simonFont; -static const byte *spanish_commonFont; -static const byte *italian_commonFont; -static const byte *french_commonFont; -static const byte *english_commonFont; -#else static const byte feeble_windowFont[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0, 128,128,128,128,128,128,128,0,0,128,0,0,0, @@ -2275,7 +2259,6 @@ static const byte english_commonFont[] = { 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, }; -#endif void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) { const byte *src; @@ -2387,29 +2370,3 @@ void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) { } // End of namespace AGOS -#ifdef PALMOS_68K -#include "scumm_globals.h" - -_GINIT(AGOS_Charset) -_GSETPTR(AGOS::russian_windowFont, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_AGOS) -//_GSETPTR(AGOS::polish_windowFont, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::french_windowFont, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::german_windowFont, GBVARS_GERMANVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::hebrew_windowFont, GBVARS_HEBREWVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::italian_windowFont, GBVARS_ITALIANVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::spanish_windowFont, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GSETPTR(AGOS::english_windowFont, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_AGOS) -_GEND - -_GRELEASE(AGOS_Charset) -_GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_AGOS) -//_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_GERMANVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_HEBREWVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_ITALIANVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_SPANISHVIDEOFONT_INDEX, GBVARS_AGOS) -_GRELEASEPTR(GBVARS_VIDEOFONT_INDEX, GBVARS_AGOS) -_GEND - -#endif diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 35bb8ea216..9c2cb42988 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -790,16 +790,3 @@ void AGOSEngine::drawMousePointer() { } } // End of namespace AGOS - -#ifdef PALMOS_68K -#include "scumm_globals.h" - -_GINIT(AGOS_Cursor) -_GSETPTR(AGOS::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_AGOS) -_GEND - -_GRELEASE(AGOS_Cursor) -_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_AGOS) -_GEND - -#endif diff --git a/engines/agos/intern.h b/engines/agos/intern.h index 44d38fbeed..a6d843d183 100644 --- a/engines/agos/intern.h +++ b/engines/agos/intern.h @@ -187,13 +187,8 @@ struct TimeEvent { }; struct GameSpecificSettings { -#ifndef PALMOS_68K const char *effects_filename; const char *speech_filename; - #else - const char effects_filename[12]; - const char speech_filename[12]; - #endif }; enum BoxFlags { |