diff options
author | Strangerke | 2014-03-08 17:49:53 +0100 |
---|---|---|
committer | Strangerke | 2014-03-08 17:49:53 +0100 |
commit | 65b819305d5021cb98bf99459e9bf4e4b9edfc9f (patch) | |
tree | 7bf7dae4b6b1098531547eb58f2bffa460a96a8b /engines/tucker | |
parent | 1e45673b4d930b2266ca05006a80cc48509b6226 (diff) | |
download | scummvm-rg350-65b819305d5021cb98bf99459e9bf4e4b9edfc9f.tar.gz scummvm-rg350-65b819305d5021cb98bf99459e9bf4e4b9edfc9f.tar.bz2 scummvm-rg350-65b819305d5021cb98bf99459e9bf4e4b9edfc9f.zip |
TUCKER: Initialize some uninitialized variables
Diffstat (limited to 'engines/tucker')
-rw-r--r-- | engines/tucker/sequences.cpp | 9 | ||||
-rw-r--r-- | engines/tucker/tucker.cpp | 6 | ||||
-rw-r--r-- | engines/tucker/tucker.h | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index cfc3503395..b77c1668b8 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -492,6 +492,15 @@ AnimationSequencePlayer::AnimationSequencePlayer(OSystem *system, Audio::Mixer * _updateScreenWidth = 0; _updateScreenPicture = false; _picBufPtr = _pic2BufPtr = 0; + + _changeToNextSequence = false; + _updateFunc = nullptr; + _updateFuncIndex = 0; + _updateScreenCounter = 0; + _updateScreenIndex = -1; + _frameCounter = 0; + _frameTime = 0; + _lastFrameTime = 1; } AnimationSequencePlayer::~AnimationSequencePlayer() { diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index 130c41724d..e67983109a 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -43,6 +43,8 @@ namespace Tucker { TuckerEngine::TuckerEngine(OSystem *system, Common::Language language, uint32 flags) : Engine(system), _gameLang(language), _gameFlags(flags), _rnd("tucker") { _console = new TuckerConsole(this); + + resetVariables(); } TuckerEngine::~TuckerEngine() { @@ -119,7 +121,7 @@ void TuckerEngine::freeBuffers() { free(_ptTextBuf); } -void TuckerEngine::restart() { +void TuckerEngine::resetVariables() { _quitGame = false; _fastMode = false; _syncCounter = 0; @@ -326,7 +328,7 @@ void TuckerEngine::restart() { void TuckerEngine::mainLoop() { allocateBuffers(); - restart(); + resetVariables(); loadCharSizeDta(); if ((_gameFlags & kGameFlagDemo) != 0) { diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index dc2e785bce..f798fac20f 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -284,7 +284,7 @@ protected: int getRandomNumber(); void allocateBuffers(); void freeBuffers(); - void restart(); + void resetVariables(); void mainLoop(); void waitForTimer(int ticksCount); void parseEvents(); |