aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorChris Apers2004-12-20 17:22:30 +0000
committerChris Apers2004-12-20 17:22:30 +0000
commit374c427c61b258cf85fbbc2ad76674c62ce2ce4e (patch)
tree51dfef551932b71b9312df3fb8548914767c1b41 /backends
parentb009d0852fb8639d7d446bc9e801ee5fd6813767 (diff)
downloadscummvm-rg350-374c427c61b258cf85fbbc2ad76674c62ce2ce4e.tar.gz
scummvm-rg350-374c427c61b258cf85fbbc2ad76674c62ce2ce4e.tar.bz2
scummvm-rg350-374c427c61b258cf85fbbc2ad76674c62ce2ce4e.zip
Cleanup
svn-id: r16173
Diffstat (limited to 'backends')
-rw-r--r--backends/PalmOS/Src/scumm_globals.cpp44
-rw-r--r--backends/PalmOS/Src/skin.cpp2
2 files changed, 15 insertions, 31 deletions
diff --git a/backends/PalmOS/Src/scumm_globals.cpp b/backends/PalmOS/Src/scumm_globals.cpp
index f234ef9d01..bf555db343 100644
--- a/backends/PalmOS/Src/scumm_globals.cpp
+++ b/backends/PalmOS/Src/scumm_globals.cpp
@@ -29,8 +29,8 @@ static void GlbInitAll() {
if (gVars->globals[GBVARS_COMMON]) {
CALL_INIT(ScummFont)
}
+ if (gVars->globals[GBVARS_ENGINE]) {
#ifndef DISABLE_SCUMM
- if (gVars->globals[GBVARS_SCUMM]) {
CALL_INIT(DimuseTables)
CALL_INIT(Akos)
CALL_INIT(DimuseCodecs)
@@ -40,36 +40,34 @@ static void GlbInitAll() {
CALL_INIT(Charset)
CALL_INIT(Costume)
CALL_INIT(PlayerV2)
- }
#endif
#ifndef DISABLE_SIMON
- if (gVars->globals[GBVARS_SIMON]) {
CALL_INIT(Simon_Simon)
+ CALL_INIT(Simon_Cursor)
CALL_INIT(Simon_Charset)
- }
+#endif
+#ifndef DISABLE_SKY
+ CALL_INIT(Sky_Hufftext)
#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)
CALL_INIT(Queen_Display)
CALL_INIT(Queen_Graphics)
CALL_INIT(Queen_Restables)
CALL_INIT(Queen_Musicdata)
- }
#endif
+ }
}
static void GlbReleaseAll() {
if (gVars->globals[GBVARS_COMMON]) {
CALL_RELEASE(ScummFont)
}
-#ifndef DISABLE_SCUMM
if (gVars->globals[GBVARS_SCUMM]) {
+#ifndef DISABLE_SCUMM
CALL_RELEASE(DimuseTables)
CALL_RELEASE(Akos)
CALL_RELEASE(DimuseCodecs)
@@ -79,28 +77,26 @@ static void GlbReleaseAll() {
CALL_RELEASE(Charset)
CALL_RELEASE(Costume)
CALL_RELEASE(PlayerV2)
- }
#endif
#ifndef DISABLE_SIMON
- if (gVars->globals[GBVARS_SIMON]) {
CALL_RELEASE(Simon_Simon)
+ CALL_RELEASE(Simon_Cursor)
CALL_RELEASE(Simon_Charset)
- }
+#endif
+#ifndef DISABLE_SKY
+ CALL_RELEASE(Sky_Hufftext)
#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)
CALL_RELEASE(Queen_Display)
CALL_RELEASE(Queen_Graphics)
CALL_RELEASE(Queen_Restables)
CALL_RELEASE(Queen_Musicdata)
- }
#endif
+ }
}
//TODO : use Boolean instead of void to check err
@@ -118,11 +114,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");
-
+ gVars->globals[GBVARS_SCUMM] = GlbOpenInternal("Glbs::Engine");
GlbInitAll();
}
@@ -131,14 +123,8 @@ void GlbClose() {
if (gVars->globals[GBVARS_COMMON])
DmCloseDatabase(gVars->globals[GBVARS_COMMON]);
- if (gVars->globals[GBVARS_SCUMM])
- 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]);
+ if (gVars->globals[GBVARS_ENGINE])
+ DmCloseDatabase(gVars->globals[GBVARS_ENGINE]);
}
void *GlbGetRecord(UInt16 index, UInt16 id) {
diff --git a/backends/PalmOS/Src/skin.cpp b/backends/PalmOS/Src/skin.cpp
index 852b7966fb..2182dc844b 100644
--- a/backends/PalmOS/Src/skin.cpp
+++ b/backends/PalmOS/Src/skin.cpp
@@ -207,8 +207,6 @@ void SknApplySkin() {
SknCloseSkin(skinDBP);
SknScreenUnlock();
SknUpdateList();
-
- gVars->skinSet = true; // for winDisplayChangedEvent redraw
}
void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP) {