diff options
-rw-r--r-- | backends/PalmOS/Src/scumm_globals.cpp | 18 | ||||
-rw-r--r-- | backends/PalmOS/Src/scumm_globals.h | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/backends/PalmOS/Src/scumm_globals.cpp b/backends/PalmOS/Src/scumm_globals.cpp index 2b2fc53b30..f234ef9d01 100644 --- a/backends/PalmOS/Src/scumm_globals.cpp +++ b/backends/PalmOS/Src/scumm_globals.cpp @@ -21,13 +21,10 @@ */ #include <PalmOS.h> -#include "start.h" +#include "palmdefs.h" #include "globals.h" #include "scumm_globals.h" -#include "stdafx.h" -#include "scumm.h" - static void GlbInitAll() { if (gVars->globals[GBVARS_COMMON]) { CALL_INIT(ScummFont) @@ -51,6 +48,11 @@ static void GlbInitAll() { CALL_INIT(Simon_Charset) } #endif +#ifndef DISABLE_SWORD1 + if (gVars->globals[GBVARS_SWORD1]) { + CALL_INIT(Sword1_fxList) + } +#endif #ifndef DISABLE_QUEEN if (gVars->globals[GBVARS_QUEEN]) { CALL_INIT(Queen_Talk) @@ -85,6 +87,11 @@ static void GlbReleaseAll() { CALL_RELEASE(Simon_Charset) } #endif +#ifndef DISABLE_SWORD1 + if (gVars->globals[GBVARS_SWORD1]) { + CALL_RELEASE(Sword1_fxList) + } +#endif #ifndef DISABLE_QUEEN if (gVars->globals[GBVARS_QUEEN]) { CALL_RELEASE(Queen_Talk) @@ -112,6 +119,7 @@ static DmOpenRef GlbOpenInternal(const Char *nameP) { void GlbOpen() { gVars->globals[GBVARS_COMMON]= GlbOpenInternal("Glbs::Common"); gVars->globals[GBVARS_SCUMM] = GlbOpenInternal("Glbs::Scumm"); + gVars->globals[GBVARS_SWORD1]= GlbOpenInternal("Glbs::Sword1"); gVars->globals[GBVARS_SIMON] = GlbOpenInternal("Glbs::Simon"); gVars->globals[GBVARS_QUEEN] = GlbOpenInternal("Glbs::Queen"); @@ -127,6 +135,8 @@ void GlbClose() { DmCloseDatabase(gVars->globals[GBVARS_SCUMM]); if (gVars->globals[GBVARS_SIMON]) DmCloseDatabase(gVars->globals[GBVARS_SIMON]); + if (gVars->globals[GBVARS_SWORD1]) + DmCloseDatabase(gVars->globals[GBVARS_SWORD1]); if (gVars->globals[GBVARS_QUEEN]) DmCloseDatabase(gVars->globals[GBVARS_QUEEN]); } diff --git a/backends/PalmOS/Src/scumm_globals.h b/backends/PalmOS/Src/scumm_globals.h index eb7e138713..ac9b919ce6 100644 --- a/backends/PalmOS/Src/scumm_globals.h +++ b/backends/PalmOS/Src/scumm_globals.h @@ -75,6 +75,11 @@ PROTO_GLOBALS(Queen_Restables) PROTO_GLOBALS(Queen_Musicdata) #endif +// Sword1 stuffs +#ifndef DISABLE_SWORD1 +PROTO_GLOBALS(Sword1_fxList) +#endif + #undef PROTO_GLOBALS #endif |