[Scummvm-cvs-logs] SF.net SVN: scummvm:[50945] scummvm/trunk/engines/cine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Jul 16 23:56:50 CEST 2010
Revision: 50945
http://scummvm.svn.sourceforge.net/scummvm/?rev=50945&view=rev
Author: fingolfin
Date: 2010-07-16 21:56:50 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
CINE: Get rid of some unnecessary g_cine refs
Modified Paths:
--------------
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/saveload.cpp
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2010-07-16 21:56:30 UTC (rev 50944)
+++ scummvm/trunk/engines/cine/cine.cpp 2010-07-16 21:56:50 UTC (rev 50945)
@@ -71,7 +71,7 @@
}
CineEngine::~CineEngine() {
- if (g_cine->getGameType() == Cine::GType_OS) {
+ if (getGameType() == Cine::GType_OS) {
freeErrmessDat();
}
DebugMan.clearAllDebugChannels();
@@ -81,7 +81,7 @@
// 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 @@
_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 @@
// 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");
}
Modified: scummvm/trunk/engines/cine/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cine/saveload.cpp 2010-07-16 21:56:30 UTC (rev 50944)
+++ scummvm/trunk/engines/cine/saveload.cpp 2010-07-16 21:56:50 UTC (rev 50945)
@@ -976,7 +976,7 @@
// restoreScreen();
checkDataDisk(-1);
} else {
- if (g_cine->getGameType() == GType_FW) {
+ if (getGameType() == GType_FW) {
makeSaveFW(*fHandle);
} else {
makeSaveOS(*fHandle);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list