[Scummvm-cvs-logs] SF.net SVN: scummvm:[35543] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Dec 25 21:53:59 CET 2008
Revision: 35543
http://scummvm.svn.sourceforge.net/scummvm/?rev=35543&view=rev
Author: fingolfin
Date: 2008-12-25 20:53:59 +0000 (Thu, 25 Dec 2008)
Log Message:
-----------
Made Engine::_timer protected
Modified Paths:
--------------
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/puzzle.cpp
scummvm/trunk/engines/saga/render.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
scummvm/trunk/engines/scumm/sound.cpp
Modified: scummvm/trunk/engines/engine.h
===================================================================
--- scummvm/trunk/engines/engine.h 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/engine.h 2008-12-25 20:53:59 UTC (rev 35543)
@@ -71,9 +71,9 @@
public:
OSystem *_system;
Audio::Mixer *_mixer;
- Common::TimerManager * _timer;
protected:
+ Common::TimerManager *_timer;
Common::EventManager *_eventMan;
Common::SaveFileManager *_saveFileMan;
@@ -250,11 +250,10 @@
*/
void openMainMenuDialog();
+ inline Common::TimerManager *getTimerManager() { return _timer; }
+ inline Common::EventManager *getEventManager() { return _eventMan; }
+ inline Common::SaveFileManager *getSaveFileManager() { return _saveFileMan; }
- Common::TimerManager *getTimerManager() { return _timer; }
- Common::EventManager *getEventManager() { return _eventMan; }
- Common::SaveFileManager *getSaveFileManager() { return _saveFileMan; }
-
public:
/** On some systems, check if the game appears to be run from CD. */
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/saga/interface.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -327,7 +327,7 @@
_disableAbortSpeeches = false;
// set save game reminder alarm
- _vm->_timer->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
+ _vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
}
Interface::~Interface(void) {
@@ -360,8 +360,8 @@
if (_active && _panelMode == kPanelMain) {
_saveReminderState = _saveReminderState % _vm->getDisplayInfo().saveReminderNumSprites + 1;
drawStatusBar();
- _vm->_timer->removeTimerProc(&saveReminderCallback);
- _vm->_timer->installTimerProc(&saveReminderCallback, ((_vm->getGameId() == GID_ITE) ? TIMETOBLINK_ITE : TIMETOBLINK_IHNM), this);
+ _vm->getTimerManager()->removeTimerProc(&saveReminderCallback);
+ _vm->getTimerManager()->installTimerProc(&saveReminderCallback, ((_vm->getGameId() == GID_ITE) ? TIMETOBLINK_ITE : TIMETOBLINK_IHNM), this);
}
}
@@ -1393,8 +1393,8 @@
fileName = _vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
_vm->save(fileName, _textInputString);
}
- _vm->_timer->removeTimerProc(&saveReminderCallback);
- _vm->_timer->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
+ _vm->getTimerManager()->removeTimerProc(&saveReminderCallback);
+ _vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
setSaveReminderState(1);
_textInput = false;
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/saga/music.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -372,7 +372,7 @@
}
Music::~Music() {
- _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback);
+ _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback);
_mixer->stopHandle(_musicHandle);
delete _player;
xmidiParser->setMidiDriver(NULL);
@@ -406,7 +406,7 @@
_player->setVolume(volume);
if (_currentVolumePercent == 100) {
- _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback);
+ _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback);
_currentVolume = _targetVolume;
}
}
@@ -421,12 +421,12 @@
if (time == 1) {
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
_player->setVolume(volume);
- _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback);
+ _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback);
_currentVolume = volume;
return;
}
- _vm->_timer->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
+ _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
}
bool Music::isPlaying() {
Modified: scummvm/trunk/engines/saga/puzzle.cpp
===================================================================
--- scummvm/trunk/engines/saga/puzzle.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/saga/puzzle.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -143,7 +143,7 @@
void Puzzle::execute(void) {
_active = true;
- _vm->_timer->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
initPieces();
@@ -158,7 +158,7 @@
void Puzzle::exitPuzzle(void) {
_active = false;
- _vm->_timer->removeTimerProc(&hintTimerCallback);
+ _vm->getTimerManager()->removeTimerProc(&hintTimerCallback);
_vm->_scene->changeScene(ITE_SCENE_LODGE, 0, kTransitionNoFade);
_vm->_interface->setMode(kPanelMain);
@@ -405,17 +405,17 @@
_vm->_actor->setSpeechColor(1, kITEColorBlack);
- _vm->_timer->removeTimerProc(&hintTimerCallback);
+ _vm->getTimerManager()->removeTimerProc(&hintTimerCallback);
switch (_hintRqState) {
case kRQSpeaking:
if (_vm->_actor->isSpeaking()) {
- _vm->_timer->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
break;
}
_hintRqState = _hintNextRqState;
- _vm->_timer->installTimerProc(&hintTimerCallback, 333333, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 333333, this);
break;
case kRQNoHint:
@@ -438,11 +438,11 @@
// Roll to see if Sakka scolds
if (_vm->_rnd.getRandomNumber(1)) {
_hintRqState = kRQSakkaDenies;
- _vm->_timer->installTimerProc(&hintTimerCallback, 200000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 200000, this);
} else {
_hintRqState = kRQSpeaking;
_hintNextRqState = kRQHintRequested;
- _vm->_timer->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
}
break;
@@ -455,7 +455,7 @@
_hintRqState = kRQSpeaking;
_hintNextRqState = kRQHintRequestedStage2;
- _vm->_timer->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
_vm->_interface->converseClear();
_vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 0, 1, 0, 0 );
@@ -482,7 +482,7 @@
_vm->_interface->converseAddText(optionsStr[_lang][kROLater], 0, 0, 0, 0);
_vm->_interface->converseDisplayText();
- _vm->_timer->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
_hintRqState = kRQSkipEverything;
break;
@@ -505,8 +505,8 @@
case 2: // Decline the hint
_vm->_actor->abortSpeech();
_hintRqState = kRQNoHint;
- _vm->_timer->removeTimerProc(&hintTimerCallback);
- _vm->_timer->installTimerProc(&hintTimerCallback, kPuzzleHintTime * 2, this);
+ _vm->getTimerManager()->removeTimerProc(&hintTimerCallback);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime * 2, this);
clearHint();
break;
}
@@ -568,8 +568,8 @@
_vm->_interface->converseAddText(optionsStr[_lang][kROLater], 0, 0, 0, 0);
_vm->_interface->converseDisplayText();
- _vm->_timer->removeTimerProc(&hintTimerCallback);
- _vm->_timer->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
+ _vm->getTimerManager()->removeTimerProc(&hintTimerCallback);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this);
}
void Puzzle::clearHint(void) {
Modified: scummvm/trunk/engines/saga/render.cpp
===================================================================
--- scummvm/trunk/engines/saga/render.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/saga/render.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -52,7 +52,7 @@
#ifdef SAGA_DEBUG
// Initialize FPS timer callback
- _vm->_timer->installTimerProc(&fpsTimerCallback, 1000000, this);
+ _vm->getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this);
#endif
_backGroundSurface.create(_vm->getDisplayInfo().width, _vm->getDisplayInfo().height, 1);
@@ -64,7 +64,7 @@
Render::~Render(void) {
#ifdef SAGA_DEBUG
- _vm->_timer->removeTimerProc(&fpsTimerCallback);
+ _vm->getTimerManager()->removeTimerProc(&fpsTimerCallback);
#endif
_backGroundSurface.free();
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -60,14 +60,14 @@
memset(_track[l], 0, sizeof(Track));
_track[l]->trackId = l;
}
- _vm->_timer->installTimerProc(timer_handler, 1000000 / _callbackFps, this);
+ _vm->getTimerManager()->installTimerProc(timer_handler, 1000000 / _callbackFps, this);
_audioNames = NULL;
_numAudioNames = 0;
}
IMuseDigital::~IMuseDigital() {
- _vm->_timer->removeTimerProc(timer_handler);
+ _vm->getTimerManager()->removeTimerProc(timer_handler);
stopAllSounds();
for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
delete _track[l];
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2008-12-25 20:40:00 UTC (rev 35542)
+++ scummvm/trunk/engines/scumm/sound.cpp 2008-12-25 20:53:59 UTC (rev 35543)
@@ -1054,12 +1054,12 @@
// it too high, and there will be a nasty "hiccup" just as Chaos
// appears.
- _vm->_timer->removeTimerProc(&cd_timer_handler);
- _vm->_timer->installTimerProc(&cd_timer_handler, 100700, _vm);
+ _vm->getTimerManager()->removeTimerProc(&cd_timer_handler);
+ _vm->getTimerManager()->installTimerProc(&cd_timer_handler, 100700, _vm);
}
void Sound::stopCDTimer() {
- _vm->_timer->removeTimerProc(&cd_timer_handler);
+ _vm->getTimerManager()->removeTimerProc(&cd_timer_handler);
}
void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
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