aboutsummaryrefslogtreecommitdiff
path: root/queen/queen.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-01-11 14:11:36 +0000
committerGregory Montoir2004-01-11 14:11:36 +0000
commit6dc8407297fc11301c8abe6c7e0801f046567449 (patch)
tree9ab212394c1443e14f8d6dcf4cffb1c18c136035 /queen/queen.cpp
parentf2874733b0cee77307ef7abd59af9b5c4ac43c9f (diff)
downloadscummvm-rg350-6dc8407297fc11301c8abe6c7e0801f046567449.tar.gz
scummvm-rg350-6dc8407297fc11301c8abe6c7e0801f046567449.tar.bz2
scummvm-rg350-6dc8407297fc11301c8abe6c7e0801f046567449.zip
cleanup
svn-id: r12318
Diffstat (limited to 'queen/queen.cpp')
-rw-r--r--queen/queen.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 3133aecf24..e9ea1dbda7 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -100,7 +100,6 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
_system->init_size(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
}
-
QueenEngine::~QueenEngine() {
_timer->removeTimerProc(&timerHandler);
delete _bam;
@@ -118,7 +117,6 @@ QueenEngine::~QueenEngine() {
delete _walk;
}
-
void QueenEngine::registerDefaultSettings() {
ConfMan.registerDefault("master_volume", 255);
ConfMan.registerDefault("music_mute", false);
@@ -128,7 +126,6 @@ void QueenEngine::registerDefaultSettings() {
ConfMan.registerDefault("subtitles", true);
}
-
void QueenEngine::checkOptionSettings() {
// check talkspeed value
if (_talkSpeed < 4) {
@@ -150,7 +147,6 @@ void QueenEngine::checkOptionSettings() {
}
}
-
void QueenEngine::readOptionSettings() {
// XXX master_volume
_sound->musicToggle(!ConfMan.getBool("music_mute"));
@@ -161,7 +157,6 @@ void QueenEngine::readOptionSettings() {
checkOptionSettings();
}
-
void QueenEngine::writeOptionSettings() {
// XXX master_volume
ConfMan.set("music_mute", !_sound->musicOn());
@@ -172,7 +167,6 @@ void QueenEngine::writeOptionSettings() {
ConfMan.flushToDisk();
}
-
void QueenEngine::update(bool checkPlayerInput) {
if (_debugger->isAttached()) {
_debugger->onFrame();
@@ -214,13 +208,8 @@ void QueenEngine::update(bool checkPlayerInput) {
void QueenEngine::errorString(const char *buf1, char *buf2) {
strcpy(buf2, buf1);
- if (_debugger && !_debugger->isAttached()) {
- _debugger->attach(buf2);
- _debugger->onFrame();
- }
}
-
void QueenEngine::go() {
initialise();
@@ -247,9 +236,6 @@ void QueenEngine::go() {
_logic->joeWalk(JWM_NORMAL);
_command->executeCurrentAction();
} else {
-// if (_command->parse()) {
-// _command->clear(true);
-// }
_logic->joeWalk(JWM_NORMAL);
update(true);
}
@@ -257,7 +243,6 @@ void QueenEngine::go() {
}
}
-
void QueenEngine::initialise(void) {
_bam = new BamScene(this);
_resource = new Resource(_gameDataPath, _system->get_savefile_manager(), getSavePath());
@@ -287,12 +272,10 @@ void QueenEngine::initialise(void) {
_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
}
-
void QueenEngine::timerHandler(void *ptr) {
((QueenEngine *)ptr)->gotTimerTick();
}
-
void QueenEngine::gotTimerTick() {
_display->handleTimer();
}