aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorMax Horn2008-10-02 17:48:01 +0000
committerMax Horn2008-10-02 17:48:01 +0000
commit3248906156d6fa2bb01c4bfa527aaba379456705 (patch)
tree0e6b02e3e7324eae9a71fbf02524cedf57c46f4e /engines/kyra
parentc77124ff50dee8864a94a31b4a0f2a588daed445 (diff)
downloadscummvm-rg350-3248906156d6fa2bb01c4bfa527aaba379456705.tar.gz
scummvm-rg350-3248906156d6fa2bb01c4bfa527aaba379456705.tar.bz2
scummvm-rg350-3248906156d6fa2bb01c4bfa527aaba379456705.zip
Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine - got rid of the _autosavePeriod member (this prevented users from changing the autosave period during runtime) - Got rid of an evil 'using GUI::Dialog' statement - Clarified some Doxygen comments svn-id: r34720
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/resource.cpp2
-rw-r--r--engines/kyra/screen.cpp4
-rw-r--r--engines/kyra/staticres.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 9a789a9eb1..798290b16c 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -64,7 +64,7 @@ bool Resource::reset() {
if (!loadPakFile(StaticResource::staticDataFilename()) || !StaticResource::checkKyraDat(this)) {
Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' file or it got corrupted, (re)get it from the ScummVM website";
- _vm->GUIErrorMessage(errorMessage);
+ GUIErrorMessage(errorMessage);
error(errorMessage.c_str());
}
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index d7c603fe11..0b859f5032 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -192,7 +192,7 @@ void Screen::setResolution() {
_system->initSize(960, 400);
else
_system->initSize(640, 400);
- _vm->initCommonGFX(true);
+ initCommonGFX(true);
_system->endGFXTransaction();
} else {
_system->beginGFXTransaction();
@@ -200,7 +200,7 @@ void Screen::setResolution() {
_system->initSize(640, 200);
else
_system->initSize(320, 200);
- _vm->initCommonGFX(false);
+ initCommonGFX(false);
_system->endGFXTransaction();
}
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index bfffefb70a..ba8de9c57f 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -361,7 +361,7 @@ void StaticResource::deinit() {
void StaticResource::outputError(const Common::String &error) {
Common::String errorMessage = "Your '" + StaticResource::staticDataFilename() + "' file " + error + ", reget a correct version from the ScummVM website";
- _vm->GUIErrorMessage(errorMessage);
+ GUIErrorMessage(errorMessage);
::error(errorMessage.c_str());
}