diff options
| author | Eugene Sandulenko | 2017-03-23 07:17:00 +0000 |
|---|---|---|
| committer | GitHub | 2017-03-23 07:17:00 +0000 |
| commit | db4979fb1c75f80396d666b2217eca9b85a2d353 (patch) | |
| tree | 3e3f47ccbcc27eb2bd72b26ca94f84b46e997652 /engines/fullpipe/fullpipe.cpp | |
| parent | 530aa6c9a04e2b14fda0538fc094028dec6a6d6e (diff) | |
| parent | 3e515890e86e924f7fa270acec0de6462a2bc0d1 (diff) | |
| download | scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.gz scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.bz2 scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.zip | |
Merge pull request #925 from bluegr/fullpipe_common_str
Fullpipe Common::String + memory leak fixes
Diffstat (limited to 'engines/fullpipe/fullpipe.cpp')
| -rw-r--r-- | engines/fullpipe/fullpipe.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index 9c474d111b..ea75af1a5a 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -131,10 +131,6 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) _stream2playing = false; - memset(_sceneTracks, 0, sizeof(_sceneTracks)); - memset(_trackName, 0, sizeof(_trackName)); - memset(_sceneTracksCurrentTrack, 0, sizeof(_sceneTracksCurrentTrack)); - _numSceneTracks = 0; _sceneTrackHasSequence = false; _sceneTrackIsPlaying = false; @@ -552,7 +548,7 @@ void FullpipeEngine::updateScreen() { ++_updateTicks; } -int FullpipeEngine::getObjectEnumState(const char *name, const char *state) { +int FullpipeEngine::getObjectEnumState(Common::String name, const char *state) { GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES"); if (!var) { @@ -569,7 +565,7 @@ int FullpipeEngine::getObjectEnumState(const char *name, const char *state) { return 0; } -int FullpipeEngine::getObjectState(const char *objname) { +int FullpipeEngine::getObjectState(Common::String objname) { GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES"); if (var) @@ -578,7 +574,7 @@ int FullpipeEngine::getObjectState(const char *objname) { return 0; } -void FullpipeEngine::setObjectState(const char *name, int state) { +void FullpipeEngine::setObjectState(Common::String name, int state) { GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES"); if (!var) { |