aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/PalmOS/Src/games.h3
-rw-r--r--backends/PalmOS/Src/launch.cpp20
-rw-r--r--backends/PalmOS/Src/scumm_globals.h6
3 files changed, 17 insertions, 12 deletions
diff --git a/backends/PalmOS/Src/games.h b/backends/PalmOS/Src/games.h
index 71e3f2a0d4..338bacc7e8 100644
--- a/backends/PalmOS/Src/games.h
+++ b/backends/PalmOS/Src/games.h
@@ -142,7 +142,8 @@ enum {
ENGINE_SCUMM = 0,
ENGINE_SIMON,
ENGINE_QUEEN,
- ENGINE_SWORD1
+ ENGINE_SWORD1,
+ ENGINE_SKY
};
// protos
diff --git a/backends/PalmOS/Src/launch.cpp b/backends/PalmOS/Src/launch.cpp
index 530d4e6c6f..3d24a803e7 100644
--- a/backends/PalmOS/Src/launch.cpp
+++ b/backends/PalmOS/Src/launch.cpp
@@ -46,10 +46,7 @@ void ModDelete() {
LocalID del_dbID;
DELET_FILE("Glbs::Common");
- DELET_FILE("Glbs::Scumm");
- DELET_FILE("Glbs::Simon");
- DELET_FILE("Glbs::Queen");
- DELET_FILE("Glbs::Sword1");
+ DELET_FILE("Glbs::Engine");
DELET_FILE("ScummVM-Engine");
}
@@ -84,21 +81,24 @@ static Err ModImport(UInt16 volRefNum, UInt8 engine) {
{ "scumm" },
{ "simon" },
{ "queen" },
- { "sword1" }
+ { "sword1" },
+ { "sky" }
};
char filename[256];
UInt16 dum1;
UInt32 dum2;
FileRef file;
- Err e;
FormPtr ofmP, frmP;
+ Err e = errNone;
ofmP = FrmGetActiveForm();
frmP = FrmInitForm(ImportForm);
FrmSetActiveForm(frmP);
FrmDrawForm(frmP);
+#ifndef _DEBUG_ENGINE
+ // In debug mode, the engine files are directly uploaded to the simulator
BUILD_FILE(files[engine], ".engine"); // engine file ?
CHECK_FILE();
BUILD_FILE(files[engine], ".data"); // data file ?
@@ -112,7 +112,7 @@ static Err ModImport(UInt16 volRefNum, UInt8 engine) {
e = (e) ? e : VFSImportDatabaseFromFile(volRefNum, filename, &dum1, &dum2);
BUILD_FILE(files[engine], ".engine");
e = (e) ? e : VFSImportDatabaseFromFile(volRefNum, filename, &dum1, &dum2);
-
+#endif
// if error, cleanup
if (e) ModDelete();
@@ -348,7 +348,7 @@ Boolean StartScummVM() {
ArgsAdd(&argvP[argc], "-d", num, &argc);
}
- if (engine == ENGINE_QUEEN) {
+ if (engine == ENGINE_QUEEN || engine == ENGINE_SKY) {
// alternative intro ?
if (gPrefs->altIntro)
ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc);
@@ -363,8 +363,8 @@ Boolean StartScummVM() {
ArgsAdd(&argvP[argc], "--demo-mode", NULL, &argc);
}
-// if (argc > MAX_ARG)
-// FrmCustomAlert(FrmErrorAlert, "Too many parameters.",0,0);
+ if (argc > MAX_ARG)
+ FrmCustomAlert(FrmErrorAlert, "Too many parameters.",0,0);
stackSize = (gPrefs->setStack ? STACK_LARGER : STACK_DEFAULT);
lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255);
diff --git a/backends/PalmOS/Src/scumm_globals.h b/backends/PalmOS/Src/scumm_globals.h
index ac9b919ce6..be8aa4f668 100644
--- a/backends/PalmOS/Src/scumm_globals.h
+++ b/backends/PalmOS/Src/scumm_globals.h
@@ -64,8 +64,13 @@ PROTO_GLOBALS(PlayerV2)
// Simon stuffs
#ifndef DISABLE_SIMON
PROTO_GLOBALS(Simon_Simon)
+PROTO_GLOBALS(Simon_Cursor)
PROTO_GLOBALS(Simon_Charset)
#endif
+// Sky stuffs
+#ifndef DISABLE_SKY
+PROTO_GLOBALS(Sky_Hufftext)
+#endif
// Queen stuffs
#ifndef DISABLE_QUEEN
PROTO_GLOBALS(Queen_Talk)
@@ -74,7 +79,6 @@ PROTO_GLOBALS(Queen_Graphics)
PROTO_GLOBALS(Queen_Restables)
PROTO_GLOBALS(Queen_Musicdata)
#endif
-
// Sword1 stuffs
#ifndef DISABLE_SWORD1
PROTO_GLOBALS(Sword1_fxList)