aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-07-16 21:56:50 +0000
committerMax Horn2010-07-16 21:56:50 +0000
commit70b6ee0a5bef3701328c456fd6f4c9d95aa47536 (patch)
treefe5c75f3f8bc0832fbb36ba1d2f7410f7d51bffc
parent587f3cf9586f019b59e7a4145e692ebde73d52df (diff)
downloadscummvm-rg350-70b6ee0a5bef3701328c456fd6f4c9d95aa47536.tar.gz
scummvm-rg350-70b6ee0a5bef3701328c456fd6f4c9d95aa47536.tar.bz2
scummvm-rg350-70b6ee0a5bef3701328c456fd6f4c9d95aa47536.zip
CINE: Get rid of some unnecessary g_cine refs
svn-id: r50945
-rw-r--r--engines/cine/cine.cpp12
-rw-r--r--engines/cine/saveload.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 9c232d0d8e..e6ac2859cf 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -71,7 +71,7 @@ CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc) : Eng
}
CineEngine::~CineEngine() {
- if (g_cine->getGameType() == Cine::GType_OS) {
+ if (getGameType() == Cine::GType_OS) {
freeErrmessDat();
}
DebugMan.clearAllDebugChannels();
@@ -81,7 +81,7 @@ Common::Error CineEngine::run() {
// Initialize backend
initGraphics(320, 200, false);
- if (g_cine->getPlatform() == Common::kPlatformPC) {
+ if (getPlatform() == Common::kPlatformPC) {
g_sound = new PCSound(_mixer, this);
} else {
// Paula chipset for Amiga and Atari versions
@@ -145,9 +145,9 @@ void CineEngine::initialize() {
_timerDelayMultiplier = 12; // Set default speed
setupOpcodes();
- initLanguage(g_cine->getLanguage());
+ initLanguage(getLanguage());
- if (g_cine->getGameType() == Cine::GType_OS) {
+ if (getGameType() == Cine::GType_OS) {
renderer = new OSRenderer;
} else {
renderer = new FWRenderer;
@@ -161,13 +161,13 @@ void CineEngine::initialize() {
// Its size will change when loading data into it with the loadPart function.
partBuffer.clear();
- if (g_cine->getGameType() == Cine::GType_OS) {
+ if (getGameType() == Cine::GType_OS) {
readVolCnf();
}
loadTextData("texte.dat");
- if (g_cine->getGameType() == Cine::GType_OS && !(g_cine->getFeatures() & GF_DEMO)) {
+ if (getGameType() == Cine::GType_OS && !(getFeatures() & GF_DEMO)) {
loadPoldatDat("poldat.dat");
loadErrmessDat("errmess.dat");
}
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 6db0d59b13..f9dfcc7737 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -976,7 +976,7 @@ void CineEngine::makeSave(char *saveFileName) {
// restoreScreen();
checkDataDisk(-1);
} else {
- if (g_cine->getGameType() == GType_FW) {
+ if (getGameType() == GType_FW) {
makeSaveFW(*fHandle);
} else {
makeSaveOS(*fHandle);