First pahse of renaming simon engine to agos. Internal renames. Compilation

is broken

svn-id: r24008

6 files changed, 17 insertions, 17 deletions

diff --git a/backends/platform/PalmOS/Src/modules.cpp b/backends/platform/PalmOS/Src/modules.cpp
index 80efa28ba9..6433c3e159 100644
--- a/backends/platform/PalmOS/Src/modules.cpp
+++ b/backends/platform/PalmOS/Src/modules.cpp
@@ -175,7 +175,7 @@ static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
 			result = GET_MODEARM;
 #else
 #	if	!defined(DISABLE_SCUMM) || \
-		!defined(DISABLE_SIMON) || \
+		!defined(DISABLE_AGOS) || \
 		!defined(DISABLE_SWORD1)
 			result = GET_DATACOMMON|GET_DATAENGINE|GET_MODE68K;
 #	else
diff --git a/backends/platform/PalmOS/Src/prefixes/68k_simon.h b/backends/platform/PalmOS/Src/prefixes/68k_simon.h
index 54a57c0e93..92ed72b9d6 100644
--- a/backends/platform/PalmOS/Src/prefixes/68k_simon.h
+++ b/backends/platform/PalmOS/Src/prefixes/68k_simon.h
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "compile.h"
-#undef DISABLE_SIMON
+#undef DISABLE_AGOS
 
 #define PALMOS_68K
 
diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h
index eaa7a60682..c9b764b333 100644
--- a/backends/platform/PalmOS/Src/prefixes/compile.h
+++ b/backends/platform/PalmOS/Src/prefixes/compile.h
@@ -29,7 +29,7 @@
 #define DISABLE_SCUMM_7_8
 #define DISABLE_HE
 
-#define DISABLE_SIMON
+#define DISABLE_AGOS
 #define DISABLE_SKY
 #define DISABLE_SWORD1
 #define DISABLE_SWORD2
diff --git a/backends/platform/PalmOS/Src/prefixes/native_simon.h b/backends/platform/PalmOS/Src/prefixes/native_simon.h
index b3c6710141..f3b3476262 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_simon.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_simon.h
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SIMON
+#undef DISABLE_AGOS
 
 #endif
diff --git a/backends/platform/PalmOS/Src/scumm_globals.cpp b/backends/platform/PalmOS/Src/scumm_globals.cpp
index a8fc5c67a6..b394fb0e86 100644
--- a/backends/platform/PalmOS/Src/scumm_globals.cpp
+++ b/backends/platform/PalmOS/Src/scumm_globals.cpp
@@ -47,10 +47,10 @@ static void GlbInitAll() {
 		CALL_INIT(PlayerV2)
 		CALL_INIT(Scumm_md5table)
 #endif
-#ifndef DISABLE_SIMON
-		CALL_INIT(Simon_Simon)
-		CALL_INIT(Simon_Cursor)
-		CALL_INIT(Simon_Charset)
+#ifndef DISABLE_AGOS
+		CALL_INIT(AGOS_AGOS)
+		CALL_INIT(AGOS_Cursor)
+		CALL_INIT(AGOS_Charset)
 #endif
 #ifndef DISABLE_SKY
 		CALL_INIT(Sky_Hufftext)
@@ -88,10 +88,10 @@ static void GlbReleaseAll() {
 		CALL_RELEASE(PlayerV2)
 		CALL_RELEASE(Scumm_md5table)
 #endif
-#ifndef DISABLE_SIMON
-		CALL_RELEASE(Simon_Simon)
-		CALL_RELEASE(Simon_Cursor)
-		CALL_RELEASE(Simon_Charset)
+#ifndef DISABLE_AGOS
+		CALL_RELEASE(AGOS_AGOS)
+		CALL_RELEASE(AGOS_AGOS)
+		CALL_RELEASE(AGOS_AGOS)
 #endif
 #ifndef DISABLE_SKY
 		CALL_RELEASE(Sky_Hufftext)
diff --git a/backends/platform/PalmOS/Src/scumm_globals.h b/backends/platform/PalmOS/Src/scumm_globals.h
index 3308c54a73..0051e4dddf 100644
--- a/backends/platform/PalmOS/Src/scumm_globals.h
+++ b/backends/platform/PalmOS/Src/scumm_globals.h
@@ -63,11 +63,11 @@ PROTO_GLOBALS(Costume)
 PROTO_GLOBALS(PlayerV2)
 PROTO_GLOBALS(Scumm_md5table)
 #endif
-// Simon stuffs
-#ifndef DISABLE_SIMON
-PROTO_GLOBALS(Simon_Simon)
-PROTO_GLOBALS(Simon_Cursor)
-PROTO_GLOBALS(Simon_Charset)
+// AGOS stuffs
+#ifndef DISABLE_AGOS
+PROTO_GLOBALS(AGOS_AGOS)
+PROTO_GLOBALS(AGOS_Cursor)
+PROTO_GLOBALS(AGOS_Charset)
 #endif
 // Sky stuffs
 #ifndef DISABLE_SKY