diff options
| author | Filippos Karapetis | 2019-06-10 01:52:35 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-06-11 00:48:16 +0300 |
| commit | 709d606e016235b663e04b9abfa9d537bdc753f0 (patch) | |
| tree | 0f7376571ed0d239e1bbc96d72b5a842caf55187 /engines/startrek/menu.cpp | |
| parent | 3f7f1a24108b1333908e82fd01455ea4f863afd3 (diff) | |
| download | scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.tar.gz scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.tar.bz2 scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.zip | |
STARTREK: Adapt many usages of Common::SharedPtr() to regular pointers
Diffstat (limited to 'engines/startrek/menu.cpp')
| -rw-r--r-- | engines/startrek/menu.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/startrek/menu.cpp b/engines/startrek/menu.cpp index 9aec7ccf93..85503e3534 100644 --- a/engines/startrek/menu.cpp +++ b/engines/startrek/menu.cpp @@ -504,10 +504,9 @@ void StarTrekEngine::loadMenuButtons(String mnuFilename, int xpos, int ypos) { _activeMenu = new Menu(); _activeMenu->nextMenu = oldMenu; - FileStream stream = loadFile(mnuFilename + ".MNU"); + Common::MemoryReadStreamEndian *stream = loadFile(mnuFilename + ".MNU"); - _activeMenu->menuFile = stream; - _activeMenu->numButtons = _activeMenu->menuFile->size() / 16; + _activeMenu->numButtons = stream->size() / 16; for (int i = 0; i < _activeMenu->numButtons; i++) { _activeMenu->sprites[i] = Sprite(); @@ -532,6 +531,8 @@ void StarTrekEngine::loadMenuButtons(String mnuFilename, int xpos, int ypos) { _activeMenu->sprites[i].drawPriority2 = 8; } + delete stream; + if (_activeMenu->retvals[_activeMenu->numButtons - 1] == 0) { // Set default retvals for buttons for (int i = 0; i < _activeMenu->numButtons; i++) |