diff options
| author | Peter Kohaut | 2019-10-13 14:08:49 +0200 |
|---|---|---|
| committer | Peter Kohaut | 2019-10-13 14:09:47 +0200 |
| commit | cd7e44f9f92c3aee7b99ecf44e8dbfbb252904d0 (patch) | |
| tree | 2fb470e0166eaf4f125778b1675b4a49c20232e4 /engines/bladerunner/bladerunner.cpp | |
| parent | 2b0bce60908ec7fb2d1e2c950d4a967bc16e158a (diff) | |
| download | scummvm-rg350-cd7e44f9f92c3aee7b99ecf44e8dbfbb252904d0.tar.gz scummvm-rg350-cd7e44f9f92c3aee7b99ecf44e8dbfbb252904d0.tar.bz2 scummvm-rg350-cd7e44f9f92c3aee7b99ecf44e8dbfbb252904d0.zip | |
BLADERUNNER: Group shapes loading
Diffstat (limited to 'engines/bladerunner/bladerunner.cpp')
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index f4032b8009..ed7846f29b 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -642,7 +642,7 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { _russianCP1251 = ((uint8)_textOptions->getText(0)[0]) == 209; _dialogueMenu = new DialogueMenu(this); - if (!_dialogueMenu->loadText("DLGMENU")) + if (!_dialogueMenu->loadResources()) return false; _suspectsDatabase = new SuspectsDatabase(this, _gameInfo->getSuspectCount()); @@ -657,11 +657,8 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { _mainFont = Font::load(this, "KIA6PT.FON", 1, false); - for (int i = 0; i != 43; ++i) { - Shape *shape = new Shape(this); - shape->open("SHAPES.SHP", i); - _shapes.push_back(shape); - } + _shapes = new Shapes(this); + _shapes->load("SHAPES.SHP"); _esper = new ESPER(this); @@ -759,10 +756,8 @@ void BladeRunnerEngine::shutdown() { delete _esper; _esper = nullptr; - for (uint i = 0; i != _shapes.size(); ++i) { - delete _shapes[i]; - } - _shapes.clear(); + delete _shapes; + _shapes = nullptr; delete _mainFont; _mainFont = nullptr; |