aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-12-29 14:39:53 +0100
committerWillem Jan Palenstijn2011-12-29 14:39:53 +0100
commitd09be37c69894929ed4925994cd41b4d72e412e0 (patch)
treeff5e44e1e10f68d60d770e0966428d1163cc76db
parent73ebccc30a8cbfe0353efc8851e6c67fd62562ee (diff)
downloadscummvm-rg350-d09be37c69894929ed4925994cd41b4d72e412e0.tar.gz
scummvm-rg350-d09be37c69894929ed4925994cd41b4d72e412e0.tar.bz2
scummvm-rg350-d09be37c69894929ed4925994cd41b4d72e412e0.zip
DREAMWEB: Minor clean up
-rw-r--r--engines/dreamweb/dreamweb.h2
-rw-r--r--engines/dreamweb/stubs.cpp14
2 files changed, 2 insertions, 14 deletions
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index c0f518d823..e261010902 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -944,10 +944,8 @@ public:
void dreamweb();
void screenUpdate();
void startup1();
- void quickQuit();
void readOneBlock();
void seeCommandTail();
- void quickQuit2();
bool checkIfPerson(uint8 x, uint8 y);
bool checkIfFree(uint8 x, uint8 y);
bool checkIfEx(uint8 x, uint8 y);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b1e86d015a..5f05f290ad 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -457,10 +457,9 @@ static const Atmosphere g_atmosphereList[] = {
};
void DreamWebEngine::dreamwebFinalize() {
- // The engine will need some cleaner finalization (destructor?), let's put it here for now
+ // The engine will need some cleaner finalization (destructor?), let's put
+ // it here for now
- // FIXME: This triggers "Deallocating non existent segment" errors when
- // quitting from a menu.
getRidOfAll();
_icons1.clear();
@@ -627,7 +626,6 @@ void DreamWebEngine::dreamweb() {
fadeScreenDowns();
hangOn(200);
endGame();
- quickQuit2();
return;
}
@@ -837,14 +835,6 @@ void DreamWebEngine::seeCommandTail() {
_brightness = 1;
}
-void DreamWebEngine::quickQuit() {
- quit();
-}
-
-void DreamWebEngine::quickQuit2() {
- quit();
-}
-
void DreamWebEngine::readMouse() {
_oldButton = _mouseButton;
uint16 state = readMouseState();