aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/platform/PalmOS/Src/builder/agos/bs_agos.c50
-rw-r--r--backends/platform/PalmOS/Src/builder/b_globals.c8
-rw-r--r--backends/platform/PalmOS/Src/builder/b_globals.h4
-rw-r--r--backends/platform/PalmOS/Src/builder/enum_globals.h4
-rw-r--r--backends/platform/PalmOS/Src/launcher/games.cpp4
-rw-r--r--backends/platform/PalmOS/Src/launcher/games.h4
-rw-r--r--engines/agos/agos.cpp12
-rw-r--r--engines/agos/charset.cpp32
-rw-r--r--engines/agos/cursor.cpp4
9 files changed, 61 insertions, 61 deletions
diff --git a/backends/platform/PalmOS/Src/builder/agos/bs_agos.c b/backends/platform/PalmOS/Src/builder/agos/bs_agos.c
index 885a41f8e9..59f9df5c4f 100644
--- a/backends/platform/PalmOS/Src/builder/agos/bs_agos.c
+++ b/backends/platform/PalmOS/Src/builder/agos/bs_agos.c
@@ -32,7 +32,7 @@ typedef struct {
#endif
} GameSpecificSettings;
///////////////////////////////////////////////////////////////////
-static void addSimon_simon1_settings() {
+static void addAGOS_simon1_settings() {
GameSpecificSettings simon1_settings = {
@@ -49,10 +49,10 @@ static void addSimon_simon1_settings() {
"GAMEPC", // gamepc_filename
};
- writeRecord(&simon1_settings, sizeof(simon1_settings), GBVARS_SIMON1SETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon1_settings, sizeof(simon1_settings), GBVARS_SIMON1SETTINGS_INDEX, GBVARS_AGOS);
}
///////////////////////////////////////////////////////////////////
-static void addSimon_simon1acorn_settings() {
+static void addAGOS_simon1acorn_settings() {
GameSpecificSettings simon1acorn_settings = {
@@ -69,10 +69,10 @@ static void addSimon_simon1acorn_settings() {
"GAMEBASE", // gamepc_filename
};
- writeRecord(&simon1acorn_settings, sizeof(simon1acorn_settings), GBVARS_SIMON1ACORNSETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon1acorn_settings, sizeof(simon1acorn_settings), GBVARS_SIMON1ACORNSETTINGS_INDEX, GBVARS_AGOS);
}
///////////////////////////////////////////////////////////////////
-static void addSimon_simon1amiga_settings() {
+static void addAGOS_simon1amiga_settings() {
GameSpecificSettings simon1amiga_settings = {
@@ -90,11 +90,11 @@ static void addSimon_simon1amiga_settings() {
};
- writeRecord(&simon1amiga_settings, sizeof(simon1amiga_settings), GBVARS_SIMON1AMIGASETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon1amiga_settings, sizeof(simon1amiga_settings), GBVARS_SIMON1AMIGASETTINGS_INDEX, GBVARS_AGOS);
}
///////////////////////////////////////////////////////////////////
-static void addSimon_simon1demo_settings() {
+static void addAGOS_simon1demo_settings() {
GameSpecificSettings simon1demo_settings = {
@@ -111,10 +111,10 @@ static void addSimon_simon1demo_settings() {
"GDEMO", // gamepc_filename
};
- writeRecord(&simon1demo_settings, sizeof(simon1demo_settings), GBVARS_SIMON1DEMOSETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon1demo_settings, sizeof(simon1demo_settings), GBVARS_SIMON1DEMOSETTINGS_INDEX, GBVARS_AGOS);
}
///////////////////////////////////////////////////////////////////
-static void addSimon_simon2win_settings() {
+static void addAGOS_simon2win_settings() {
GameSpecificSettings simon2win_settings = {
@@ -132,10 +132,10 @@ static void addSimon_simon2win_settings() {
};
- writeRecord(&simon2win_settings, sizeof(simon2win_settings), GBVARS_SIMON2WINSETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon2win_settings, sizeof(simon2win_settings), GBVARS_SIMON2WINSETTINGS_INDEX, GBVARS_AGOS);
}
///////////////////////////////////////////////////////////////////
-static void addSimon_simon2dos_settings() {
+static void addAGOS_simon2dos_settings() {
GameSpecificSettings simon2dos_settings = {
@@ -152,11 +152,11 @@ static void addSimon_simon2dos_settings() {
"GAME32", // gamepc_filename
};
- writeRecord(&simon2dos_settings, sizeof(simon2dos_settings), GBVARS_SIMON2DOSSETTINGS_INDEX, GBVARS_SIMON);
+ writeRecord(&simon2dos_settings, sizeof(simon2dos_settings), GBVARS_SIMON2DOSSETTINGS_INDEX, GBVARS_AGOS);
}
typedef unsigned char byte;
-static void addSimon_simon1_cursor() {
+static void addAGOS_simon1_cursor() {
byte _simon1_cursor[256] = {
@@ -178,10 +178,10 @@ static void addSimon_simon1_cursor() {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
};
- writeRecord(&_simon1_cursor, sizeof(_simon1_cursor), GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON);
+ writeRecord(&_simon1_cursor, sizeof(_simon1_cursor), GBVARS_SIMON1CURSOR_INDEX, GBVARS_AGOS);
}
/*
-static void addSimon_simon2_cursors() {
+static void addAGOS_simon2_cursors() {
byte _simon2_cursors[10][256] = {
@@ -357,21 +357,21 @@ static void addSimon_simon2_cursors() {
0xff,0xff,0xff,0xff,0xff,0xff,0xe5,0xe5,0xe5,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
};
- writeRecord(&_simon2_cursors, sizeof(_simon2_cursors), GBVARS_SIMON2CURSORS_INDEX, GBVARS_SIMON);
+ writeRecord(&_simon2_cursors, sizeof(_simon2_cursors), GBVARS_SIMON2CURSORS_INDEX, GBVARS_AGOS);
}*/
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
-void addSimon() {
- addSimon_simon1_settings();
- addSimon_simon1acorn_settings();
- addSimon_simon1amiga_settings();
- addSimon_simon1demo_settings();
- addSimon_simon2win_settings();
- addSimon_simon2dos_settings();
+void addAGOS() {
+ addAGOS_simon1_settings();
+ addAGOS_simon1acorn_settings();
+ addAGOS_simon1amiga_settings();
+ addAGOS_simon1demo_settings();
+ addAGOS_simon2win_settings();
+ addAGOS_simon2dos_settings();
- addSimon_simon1_cursor();
-// addSimon_simon2_cursors();
+ addAGOS_simon1_cursor();
+// addAGOS_simon2_cursors();
}
diff --git a/backends/platform/PalmOS/Src/builder/b_globals.c b/backends/platform/PalmOS/Src/builder/b_globals.c
index dec25e96b4..ad0bd3a014 100644
--- a/backends/platform/PalmOS/Src/builder/b_globals.c
+++ b/backends/platform/PalmOS/Src/builder/b_globals.c
@@ -3,7 +3,7 @@
//#define BUILD_COMMON
-//#define BUILD_SIMON
+//#define BUILD_AGOS
#define BUILD_SCUMM
//#define BUILD_SKY
//#define BUILD_QUEEN
@@ -63,9 +63,9 @@ void buildAll() {
addPlayerV2();
addScummTables();
-#elif defined(BUILD_SIMON)
- addSimon();
- Simon_addCharset();
+#elif defined(BUILD_AGOS)
+ addAGOS();
+ AGOS_addCharset();
#elif defined(BUILD_SKY)
Sky_addHufftext();
diff --git a/backends/platform/PalmOS/Src/builder/b_globals.h b/backends/platform/PalmOS/Src/builder/b_globals.h
index 6954a50999..c1c35a5a4b 100644
--- a/backends/platform/PalmOS/Src/builder/b_globals.h
+++ b/backends/platform/PalmOS/Src/builder/b_globals.h
@@ -23,8 +23,8 @@ void addCostume();
void addPlayerV2();
void addScummTables();
/////////////////////////////////
-void addSimon();
-void Simon_addCharset();
+void addAGOS();
+void AGOS_addCharset();
/////////////////////////////////
void Queen_addTalk();
void Queen_addRestables();
diff --git a/backends/platform/PalmOS/Src/builder/enum_globals.h b/backends/platform/PalmOS/Src/builder/enum_globals.h
index 45425299c6..2844dfe7db 100644
--- a/backends/platform/PalmOS/Src/builder/enum_globals.h
+++ b/backends/platform/PalmOS/Src/builder/enum_globals.h
@@ -41,7 +41,7 @@ enum {
GBVARS_MD5TABLE_INDEX
//GBVARS_SMALLSCALETABLEAKOS_INDEX
};
-// Simon
+// AGOS
enum {
GBVARS_SIMON1SETTINGS_INDEX = 0,
GBVARS_SIMON1ACORNSETTINGS_INDEX,
@@ -99,7 +99,7 @@ enum {
GBVARS_COMMON = 0,
GBVARS_ENGINE = 1,
GBVARS_SCUMM = GBVARS_ENGINE,
- GBVARS_SIMON = GBVARS_ENGINE,
+ GBVARS_AGOS = GBVARS_ENGINE,
GBVARS_SKY = GBVARS_ENGINE,
GBVARS_SWORD1 = GBVARS_ENGINE,
// GBVARS_SWORD2 = GBVARS_ENGINE,
diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp
index 166aae6aa4..21da0012ca 100644
--- a/backends/platform/PalmOS/Src/launcher/games.cpp
+++ b/backends/platform/PalmOS/Src/launcher/games.cpp
@@ -172,8 +172,8 @@ static Err GamUpdateList() {
gitCur.engine++;
if (gitCur.engine == ENGINE_SCUMM) // reorder
- gitCur.engine = ENGINE_SIMON;
- else if (gitCur.engine == ENGINE_SIMON)
+ gitCur.engine = ENGINE_AGOS;
+ else if (gitCur.engine == ENGINE_AGOS)
gitCur.engine = ENGINE_SCUMM;
}
diff --git a/backends/platform/PalmOS/Src/launcher/games.h b/backends/platform/PalmOS/Src/launcher/games.h
index bb005e66fb..357623b5d3 100644
--- a/backends/platform/PalmOS/Src/launcher/games.h
+++ b/backends/platform/PalmOS/Src/launcher/games.h
@@ -164,7 +164,7 @@ enum {
ENGINE_SAGA,
ENGINE_SCUMM,
ENGINE_AGI,
- ENGINE_SIMON,
+ ENGINE_AGOS,
ENGINE_COUNT
};
@@ -183,7 +183,7 @@ static const struct {
{ "saga", "SAGA Engine" },
{ "scumm", "Scumm Games" },
{ "agi", "Sierra AGI" },
- { "simon", "Simon the Sorcerer" },
+ { "simon", "AGOS" },
};
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 4248e311ce..b5115df955 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -2278,15 +2278,15 @@ void SimonEngine::set_volume(int volume) {
#include "scumm_globals.h"
_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)
+_GSETPTR(Simon::simon1_settings, GBVARS_SIMON1SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_AGOS)
+_GSETPTR(Simon::simon2_settings, GBVARS_SIMON2SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_AGOS)
+_GSETPTR(Simon::feeblefiles_settings, GBVARS_FEEBLEFILESSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_AGOS)
_GEND
_GRELEASE(AGOS_AGOS)
-_GRELEASEPTR(GBVARS_SIMON1SETTINGS_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_SIMON2SETTINGS_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_FEEBLEFILESSETTINGS_INDEX, GBVARS_SIMON)
+_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 f051197d4b..987c953223 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -1605,25 +1605,25 @@ void SimonEngine::video_putchar_drawchar(WindowBlock *window, uint x, uint y, by
#include "scumm_globals.h"
_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)
-_GSETPTR(Simon::german_video_font, GBVARS_GERMANVIDEOFONT_INDEX, byte, GBVARS_SIMON)
-_GSETPTR(Simon::hebrew_video_font, GBVARS_HEBREWVIDEOFONT_INDEX, byte, GBVARS_SIMON)
-_GSETPTR(Simon::italian_video_font, GBVARS_ITALIANVIDEOFONT_INDEX, byte, GBVARS_SIMON)
-_GSETPTR(Simon::spanish_video_font, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_SIMON)
-_GSETPTR(Simon::video_font, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_SIMON)
+_GSETPTR(Simon::russian_video_font, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+//_GSETPTR(Simon::polish_video_font, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::french_video_font, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::german_video_font, GBVARS_GERMANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::hebrew_video_font, GBVARS_HEBREWVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::italian_video_font, GBVARS_ITALIANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::spanish_video_font, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
+_GSETPTR(Simon::video_font, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_AGOS)
_GEND
_GRELEASE(AGOS_Charset)
-_GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_SIMON)
-//_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_GERMANVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_HEBREWVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_ITALIANVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_SPANISHVIDEOFONT_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_VIDEOFONT_INDEX, GBVARS_SIMON)
+_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 fe342f635d..dfae34c543 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -485,11 +485,11 @@ void SimonEngine::drawMousePart(int image, byte x, byte y) {
#include "scumm_globals.h"
_GINIT(AGOS_Cursor)
-_GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON)
+_GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_AGOS)
_GEND
_GRELEASE(AGOS_Cursor)
-_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON)
+_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_AGOS)
_GEND
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 08:23:41 +0000