aboutsummaryrefslogtreecommitdiff
path: root/backends/PalmOS/Src
diff options
context:
space:
mode:
authorChris Apers2004-01-20 14:18:08 +0000
committerChris Apers2004-01-20 14:18:08 +0000
commitcc123e7e28f977c336b0c6d73e291e84f5941e02 (patch)
tree580d709fed4508a80a637eb568df818f8b666b9a /backends/PalmOS/Src
parentb90139eae7fe1bf8db45d50130431c07670b2787 (diff)
downloadscummvm-rg350-cc123e7e28f977c336b0c6d73e291e84f5941e02.tar.gz
scummvm-rg350-cc123e7e28f977c336b0c6d73e291e84f5941e02.tar.bz2
scummvm-rg350-cc123e7e28f977c336b0c6d73e291e84f5941e02.zip
Updated with lastest CVS changes
svn-id: r12549
Diffstat (limited to 'backends/PalmOS/Src')
-rw-r--r--backends/PalmOS/Src/scumm_globals.cpp21
-rw-r--r--backends/PalmOS/Src/scumm_globals.h4
2 files changed, 13 insertions, 12 deletions
diff --git a/backends/PalmOS/Src/scumm_globals.cpp b/backends/PalmOS/Src/scumm_globals.cpp
index 3941696a86..04db76156b 100644
--- a/backends/PalmOS/Src/scumm_globals.cpp
+++ b/backends/PalmOS/Src/scumm_globals.cpp
@@ -25,15 +25,16 @@
#include "globals.h"
#include "scumm_globals.h"
+#include "stdafx.h"
#include "scumm.h"
static void GlbInitAll() {
#ifndef DISABLE_SCUMM
if (gVars->globals[GBVARS_SCUMM]) {
- CALL_INIT(IMuseDigital)
+ CALL_INIT(DimuseTables)
CALL_INIT(NewGui)
CALL_INIT(Akos)
- CALL_INIT(Bundle)
+ CALL_INIT(DimuseCodecs)
CALL_INIT(Codec47)
CALL_INIT(Gfx)
CALL_INIT(Dialogs)
@@ -49,19 +50,19 @@ static void GlbInitAll() {
}
#endif
#ifndef DISABLE_QUEEN
- if (gVars->globals[GBVARS_QUEEN]) {
- CALL_INIT(Queen_Restables)
- }
+// if (gVars->globals[GBVARS_QUEEN]) {
+// CALL_INIT(Queen_Restables)
+// }
#endif
}
static void GlbReleaseAll() {
#ifndef DISABLE_SCUMM
if (gVars->globals[GBVARS_SCUMM]) {
- CALL_RELEASE(IMuseDigital)
+ CALL_RELEASE(DimuseTables)
CALL_RELEASE(NewGui)
CALL_RELEASE(Akos)
- CALL_RELEASE(Bundle)
+ CALL_RELEASE(DimuseCodecs)
CALL_RELEASE(Codec47)
CALL_RELEASE(Gfx)
CALL_RELEASE(Dialogs)
@@ -77,9 +78,9 @@ static void GlbReleaseAll() {
}
#endif
#ifndef DISABLE_QUEEN
- if (gVars->globals[GBVARS_QUEEN]) {
- CALL_RELEASE(Queen_Restables)
- }
+// if (gVars->globals[GBVARS_QUEEN]) {
+// CALL_RELEASE(Queen_Restables)
+// }
#endif
}
diff --git a/backends/PalmOS/Src/scumm_globals.h b/backends/PalmOS/Src/scumm_globals.h
index 221da86c69..96f0c4937b 100644
--- a/backends/PalmOS/Src/scumm_globals.h
+++ b/backends/PalmOS/Src/scumm_globals.h
@@ -45,10 +45,10 @@ void GlbClose();
void CALL_RELEASE(x);
#ifndef DISABLE_SCUMM
-PROTO_GLOBALS(IMuseDigital)
+PROTO_GLOBALS(DimuseTables)
PROTO_GLOBALS(NewGui)
PROTO_GLOBALS(Akos)
-PROTO_GLOBALS(Bundle)
+PROTO_GLOBALS(DimuseCodecs)
PROTO_GLOBALS(Codec47)
PROTO_GLOBALS(Gfx)
PROTO_GLOBALS(Dialogs)