From 8e2c703baba570b18aec9d871fdc8ee7efe49e57 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 29 Sep 2006 08:14:27 +0000 Subject: First pahse of renaming simon engine to agos. Internal renames. Compilation is broken svn-id: r24008 --- engines/engines.mk | 6 +++--- engines/simon/animation.cpp | 6 +++--- engines/simon/charset.cpp | 8 ++++---- engines/simon/cursor.cpp | 6 +++--- engines/simon/debug.cpp | 10 +++++----- engines/simon/debug.h | 4 ++-- engines/simon/debugger.cpp | 4 ++-- engines/simon/debugger.h | 4 ++-- engines/simon/draw.cpp | 4 ++-- engines/simon/event.cpp | 4 ++-- engines/simon/game.cpp | 14 +++++++------- engines/simon/icons.cpp | 2 +- engines/simon/intern.h | 4 ++-- engines/simon/items.cpp | 4 ++-- engines/simon/midi.cpp | 4 ++-- engines/simon/midi.h | 4 ++-- engines/simon/module.mk | 8 ++++---- engines/simon/oracle.cpp | 6 +++--- engines/simon/res.cpp | 6 +++--- engines/simon/rooms.cpp | 4 ++-- engines/simon/saveload.cpp | 4 ++-- engines/simon/simon.cpp | 12 ++++++------ engines/simon/simon.h | 12 ++++++------ engines/simon/sound.cpp | 4 ++-- engines/simon/sound.h | 6 +++--- engines/simon/string.cpp | 4 ++-- engines/simon/subroutine.cpp | 4 ++-- engines/simon/verb.cpp | 4 ++-- engines/simon/vga.cpp | 6 +++--- engines/simon/vga.h | 4 ++-- engines/simon/window.cpp | 4 ++-- 31 files changed, 88 insertions(+), 88 deletions(-) (limited to 'engines') diff --git a/engines/engines.mk b/engines/engines.mk index eee601b9fd..d4be1c1674 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -13,10 +13,10 @@ endif endif -ifdef DISABLE_SIMON -DEFINES += -DDISABLE_SIMON +ifdef DISABLE_AGOS +DEFINES += -DDISABLE_AGOS else -MODULES += engines/simon +MODULES += engines/agos endif ifdef DISABLE_SKY diff --git a/engines/simon/animation.cpp b/engines/simon/animation.cpp index 8834ee6ffc..9302055241 100644 --- a/engines/simon/animation.cpp +++ b/engines/simon/animation.cpp @@ -28,9 +28,9 @@ #include "graphics/cursorman.h" -#include "simon/animation.h" -#include "simon/intern.h" -#include "simon/simon.h" +#include "agos/animation.h" +#include "agos/intern.h" +#include "agos/agos.h" #include "sound/audiostream.h" #include "sound/wave.h" diff --git a/engines/simon/charset.cpp b/engines/simon/charset.cpp index 712ed0bc3b..f051197d4b 100644 --- a/engines/simon/charset.cpp +++ b/engines/simon/charset.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { @@ -1604,7 +1604,7 @@ void SimonEngine::video_putchar_drawchar(WindowBlock *window, uint x, uint y, by #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Charset) +_GINIT(AGOS_Charset) _GSETPTR(Simon::russian_video_font, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_SIMON) //_GSETPTR(Simon::polish_video_font, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_SIMON) _GSETPTR(Simon::french_video_font, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_SIMON) @@ -1615,7 +1615,7 @@ _GSETPTR(Simon::spanish_video_font, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_ _GSETPTR(Simon::video_font, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Charset) +_GRELEASE(AGOS_Charset) _GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_SIMON) //_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_SIMON) diff --git a/engines/simon/cursor.cpp b/engines/simon/cursor.cpp index 5c7e9db6dd..fe342f635d 100644 --- a/engines/simon/cursor.cpp +++ b/engines/simon/cursor.cpp @@ -27,7 +27,7 @@ #include "graphics/cursorman.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { @@ -484,11 +484,11 @@ void SimonEngine::drawMousePart(int image, byte x, byte y) { #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Cursor) +_GINIT(AGOS_Cursor) _GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Cursor) +_GRELEASE(AGOS_Cursor) _GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON) _GEND diff --git a/engines/simon/debug.cpp b/engines/simon/debug.cpp index 05f348ad31..a0e980f807 100644 --- a/engines/simon/debug.cpp +++ b/engines/simon/debug.cpp @@ -21,13 +21,13 @@ * */ -// Simon debug functions +// AGOS debug functions #include "common/stdafx.h" -#include "simon/debug.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/debug.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" #include diff --git a/engines/simon/debug.h b/engines/simon/debug.h index 51587a4f59..e6f478deee 100644 --- a/engines/simon/debug.h +++ b/engines/simon/debug.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_DEBUG_H -#define SIMON_DEBUG_H +#ifndef AGOS_DEBUG_H +#define AGOS_DEBUG_H namespace Simon { diff --git a/engines/simon/debugger.cpp b/engines/simon/debugger.cpp index 7e2694966a..8fc4702d1e 100644 --- a/engines/simon/debugger.cpp +++ b/engines/simon/debugger.cpp @@ -25,8 +25,8 @@ #include "common/config-manager.h" -#include "simon/debugger.h" -#include "simon/simon.h" +#include "agos/debugger.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/debugger.h b/engines/simon/debugger.h index 2c8e28d20e..cd43f3e1eb 100644 --- a/engines/simon/debugger.h +++ b/engines/simon/debugger.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_DEBUGGER_H -#define SIMON_DEBUGGER_H +#ifndef AGOS_DEBUGGER_H +#define AGOS_DEBUGGER_H #include "gui/debugger.h" diff --git a/engines/simon/draw.cpp b/engines/simon/draw.cpp index a684093d4d..ab65cd0af2 100644 --- a/engines/simon/draw.cpp +++ b/engines/simon/draw.cpp @@ -25,8 +25,8 @@ #include "common/system.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/event.cpp b/engines/simon/event.cpp index 1448633743..4755dea987 100644 --- a/engines/simon/event.cpp +++ b/engines/simon/event.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp index 65754e104d..f4997520ab 100644 --- a/engines/simon/game.cpp +++ b/engines/simon/game.cpp @@ -32,7 +32,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { static DetectedGameList GAME_detectGames(const FSList &fslist); @@ -80,7 +80,7 @@ static const PlainGameDescriptor simonGames[] = { {NULL, NULL} }; -GameList Engine_SIMON_gameIDList() { +GameList Engine_AGOS_gameIDList() { GameList games; const PlainGameDescriptor *g = simonGames; while (g->gameid) { @@ -91,7 +91,7 @@ GameList Engine_SIMON_gameIDList() { return games; } -GameDescriptor Engine_SIMON_findGameID(const char *gameid) { +GameDescriptor Engine_AGOS_findGameID(const char *gameid) { // First search the list of supported game IDs. const PlainGameDescriptor *g = simonGames; while (g->gameid) { @@ -115,11 +115,11 @@ GameDescriptor Engine_SIMON_findGameID(const char *gameid) { return gs; } -DetectedGameList Engine_SIMON_detectGames(const FSList &fslist) { +DetectedGameList Engine_AGOS_detectGames(const FSList &fslist) { return Simon::GAME_detectGames(fslist); } -PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { +PluginError Engine_AGOS_create(OSystem *syst, Engine **engine) { assert(syst); assert(engine); const char *gameid = ConfMan.get("gameid").c_str(); @@ -147,7 +147,7 @@ PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { } // Invoke the detector - DetectedGameList detectedGames = Engine_SIMON_detectGames(fslist); + DetectedGameList detectedGames = Engine_AGOS_detectGames(fslist); for (uint i = 0; i < detectedGames.size(); i++) { if (detectedGames[i].gameid == gameid) { @@ -160,7 +160,7 @@ PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { return kNoGameDataFoundError; } -REGISTER_PLUGIN(SIMON, "Simon the Sorcerer", "Simon the Sorcerer (C) Adventure Soft"); +REGISTER_PLUGIN(AGOS, "AGOS", "AGOS (C) Adventure Soft"); namespace Simon { diff --git a/engines/simon/icons.cpp b/engines/simon/icons.cpp index c20a0758c8..2904d9024d 100644 --- a/engines/simon/icons.cpp +++ b/engines/simon/icons.cpp @@ -25,7 +25,7 @@ #include "common/file.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/intern.h b/engines/simon/intern.h index 7dca106266..587eca621c 100644 --- a/engines/simon/intern.h +++ b/engines/simon/intern.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_INTERN_H -#define SIMON_INTERN_H +#ifndef AGOS_INTERN_H +#define AGOS_INTERN_H namespace Simon { diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 6a7aa26a88..b908d0f5ab 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -27,8 +27,8 @@ #include "common/system.h" -#include "simon/animation.h" -#include "simon/simon.h" +#include "agos/animation.h" +#include "agos/agos.h" #ifdef _WIN32_WCE extern bool isSmartphone(void); diff --git a/engines/simon/midi.cpp b/engines/simon/midi.cpp index 2d85983ad4..2ff9bbd8ad 100644 --- a/engines/simon/midi.cpp +++ b/engines/simon/midi.cpp @@ -26,9 +26,9 @@ #include "common/file.h" #include "common/system.h" -#include "simon/simon.h" +#include "agos/agos.h" -#include "sound/mixer.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/midi.h b/engines/simon/midi.h index 00c8843c66..cf055bffac 100644 --- a/engines/simon/midi.h +++ b/engines/simon/midi.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_MIDI_H -#define SIMON_MIDI_H +#ifndef AGOS_MIDI_H +#define AGOS_MIDI_H #include "sound/mididrv.h" #include "sound/midiparser.h" diff --git a/engines/simon/module.mk b/engines/simon/module.mk index 0c98b65d34..d58c545866 100644 --- a/engines/simon/module.mk +++ b/engines/simon/module.mk @@ -1,6 +1,7 @@ -MODULE := engines/simon +MODULE := engines/agos MODULE_OBJS := \ + agos.o \ animation.o \ charset.o \ cursor.o \ @@ -13,17 +14,16 @@ MODULE_OBJS := \ items.o \ midi.o \ midiparser_s1d.o \ - oracle.o \ + oracle.o \ res.o \ rooms.o \ saveload.o \ - simon.o \ sound.o \ string.o \ subroutine.o \ verb.o \ vga.o \ - window.o \ + window.o # This module can be built as a plugin ifdef BUILD_PLUGINS diff --git a/engines/simon/oracle.cpp b/engines/simon/oracle.cpp index 22fbf72375..3e6448fbae 100644 --- a/engines/simon/oracle.cpp +++ b/engines/simon/oracle.cpp @@ -25,9 +25,9 @@ #include "common/savefile.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" namespace Simon { diff --git a/engines/simon/res.cpp b/engines/simon/res.cpp index 4724353ce1..e8d4f2fd04 100644 --- a/engines/simon/res.cpp +++ b/engines/simon/res.cpp @@ -26,9 +26,9 @@ #include "common/file.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/sound.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" #ifdef USE_ZLIB diff --git a/engines/simon/rooms.cpp b/engines/simon/rooms.cpp index 3752d4cf37..ca2b84e9f9 100644 --- a/engines/simon/rooms.cpp +++ b/engines/simon/rooms.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/saveload.cpp b/engines/simon/saveload.cpp index a0d4d6d96a..37907024b6 100644 --- a/engines/simon/saveload.cpp +++ b/engines/simon/saveload.cpp @@ -29,8 +29,8 @@ #include "gui/about.h" #include "gui/message.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 1dd0a45882..4248e311ce 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -30,10 +30,10 @@ #include "gui/about.h" -#include "simon/debugger.h" -#include "simon/intern.h" -#include "simon/simon.h" -#include "simon/vga.h" +#include "agos/debugger.h" +#include "agos/intern.h" +#include "agos/agos.h" +#include "agos/vga.h" #include "sound/mididrv.h" @@ -2277,13 +2277,13 @@ void SimonEngine::set_volume(int volume) { #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Simon) +_GINIT(AGOS_AGOS) _GSETPTR(Simon::simon1_settings, GBVARS_SIMON1SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GSETPTR(Simon::simon2_settings, GBVARS_SIMON2SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GSETPTR(Simon::feeblefiles_settings, GBVARS_FEEBLEFILESSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Simon) +_GRELEASE(AGOS_AGOS) _GRELEASEPTR(GBVARS_SIMON1SETTINGS_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_SIMON2SETTINGS_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_FEEBLEFILESSETTINGS_INDEX, GBVARS_SIMON) diff --git a/engines/simon/simon.h b/engines/simon/simon.h index a945a6c55e..90f3a1506c 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -21,18 +21,18 @@ * */ -#ifndef SIMON_H -#define SIMON_H +#ifndef AGOS_AGOS_H +#define AGOS_AGOS_H #include "engines/engine.h" #include "common/rect.h" #include "common/util.h" -#include "simon/animation.h" -#include "simon/midi.h" -#include "simon/sound.h" -#include "simon/vga.h" +#include "agos/animation.h" +#include "agos/midi.h" +#include "agos/sound.h" +#include "agos/vga.h" namespace Simon { diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp index 2ac4e629eb..42c2df1723 100644 --- a/engines/simon/sound.cpp +++ b/engines/simon/sound.cpp @@ -26,8 +26,8 @@ #include "common/file.h" #include "common/util.h" -#include "simon/simon.h" -#include "simon/sound.h" +#include "agos/agos.h" +#include "agos/sound.h" #include "sound/adpcm.h" #include "sound/audiostream.h" diff --git a/engines/simon/sound.h b/engines/simon/sound.h index f744e18498..ce7b655b90 100644 --- a/engines/simon/sound.h +++ b/engines/simon/sound.h @@ -21,11 +21,11 @@ * */ -#ifndef SIMON_SOUND_H -#define SIMON_SOUND_H +#ifndef AGOS_SOUND_H +#define AGOS_SOUND_H #include "sound/mixer.h" -#include "simon/intern.h" +#include "agos/intern.h" #include "common/str.h" namespace Simon { diff --git a/engines/simon/string.cpp b/engines/simon/string.cpp index ba959759da..b85eb9a9dd 100644 --- a/engines/simon/string.cpp +++ b/engines/simon/string.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/subroutine.cpp b/engines/simon/subroutine.cpp index eebf67cb19..b5a7c1f9f7 100644 --- a/engines/simon/subroutine.cpp +++ b/engines/simon/subroutine.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/verb.cpp b/engines/simon/verb.cpp index ed621d712e..014ca36df7 100644 --- a/engines/simon/verb.cpp +++ b/engines/simon/verb.cpp @@ -24,8 +24,8 @@ // Verb and hitarea handling #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index a91ce5ac4e..d7deb2fbc0 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -24,9 +24,9 @@ // Video script opcodes for Simon1/Simon2 #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" #include "common/system.h" diff --git a/engines/simon/vga.h b/engines/simon/vga.h index fece63bf3a..e963d0350b 100644 --- a/engines/simon/vga.h +++ b/engines/simon/vga.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_VGA_H -#define SIMON_VGA_H +#ifndef AGOS_VGA_H +#define AGOS_VGA_H namespace Simon { diff --git a/engines/simon/window.cpp b/engines/simon/window.cpp index aa39ac0c97..c21f8ad6d2 100644 --- a/engines/simon/window.cpp +++ b/engines/simon/window.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { -- cgit v1.2.3