diff options
Diffstat (limited to 'engines/tony')
| -rw-r--r-- | engines/tony/font.cpp | 6 | ||||
| -rw-r--r-- | engines/tony/game.cpp | 7 | ||||
| -rw-r--r-- | engines/tony/gfxcore.h | 1 | ||||
| -rw-r--r-- | engines/tony/mpal/mpalutils.cpp | 2 | ||||
| -rw-r--r-- | engines/tony/sound.cpp | 1 | ||||
| -rw-r--r-- | engines/tony/tony.cpp | 2 |
6 files changed, 18 insertions, 1 deletions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index 850aff17be..fb40bf5c67 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -921,6 +921,12 @@ RMDialogChoice::RMDialogChoice() { _curAdded = 0; _bShow = false; + + _curSelection = 0; + _numChoices = 0; + + _drawedStrings = NULL; + _ptDrawStrings = NULL; } RMDialogChoice::~RMDialogChoice() { diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp index 0a2c62330b..7b9cb4c6ca 100644 --- a/engines/tony/game.cpp +++ b/engines/tony/game.cpp @@ -319,6 +319,11 @@ RMOptionScreen::RMOptionScreen() { _fadeTime = 0; _nEditPos = 0; _nLastState = MENUGAME; + + _bExit = false; + _bLoadMenuOnly = false; + _bNoLoadSave = false; + _bAlterGfx = false; } RMOptionScreen::~RMOptionScreen() { @@ -1145,7 +1150,7 @@ void RMOptionScreen::doFrame(CORO_PARAM, RMInput *input) { // Turn on edit mode _bEditSaveName = true; _nEditPos = _ctx->i; - strcpy(_editName, _curThumbName[_ctx->i].c_str()); + Common::strlcpy(_editName, _curThumbName[_ctx->i].c_str(), sizeof(_editName)); _ctx->bRefresh = true; } diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h index c9081506d7..1a0738e5b7 100644 --- a/engines/tony/gfxcore.h +++ b/engines/tony/gfxcore.h @@ -442,6 +442,7 @@ private: OTList(); OTList(RMGfxPrimitive *pr) { _prim = pr; + _next = NULL; } }; diff --git a/engines/tony/mpal/mpalutils.cpp b/engines/tony/mpal/mpalutils.cpp index 84c8a68919..d52e7332cc 100644 --- a/engines/tony/mpal/mpalutils.cpp +++ b/engines/tony/mpal/mpalutils.cpp @@ -37,6 +37,8 @@ namespace MPAL { * @param resId MPAL resource to open */ RMRes::RMRes(uint32 resID) { + _buf = NULL; + _h = g_vm->_resUpdate.queryResource(resID); if (_h == NULL) _h = mpalQueryResource(resID); diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp index aa86750ad5..fed51dacf4 100644 --- a/engines/tony/sound.cpp +++ b/engines/tony/sound.cpp @@ -161,6 +161,7 @@ FPSfx::FPSfx(bool soundOn) { _loopStream = 0; _rewindableStream = 0; _paused = false; + _loop = 0; g_vm->_activeSfx.push_back(this); } diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index d8fa45cb5d..c51f449aa1 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -83,6 +83,8 @@ TonyEngine::TonyEngine(OSystem *syst, const TonyGameDescription *gameDesc) : Eng _bTimeFreezed = false; _nTimeFreezed = 0; _vdbCodec = FPCODEC_UNKNOWN; + + memset(_funcList, 0, sizeof(_funcList)); } TonyEngine::~TonyEngine() { |