diff options
| author | Eugene Sandulenko | 2016-04-28 12:37:03 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-04-28 12:37:03 +0200 |
| commit | 5fbac749e2951577dbe822aa789ad30005a2bf21 (patch) | |
| tree | fc1e180414df4207734f555834d911f94ea9b4c4 /engines/wage/world.cpp | |
| parent | b5335ed9d46185cbd21c5a9840b1e28ad2cc79ac (diff) | |
| download | scummvm-rg350-5fbac749e2951577dbe822aa789ad30005a2bf21.tar.gz scummvm-rg350-5fbac749e2951577dbe822aa789ad30005a2bf21.tar.bz2 scummvm-rg350-5fbac749e2951577dbe822aa789ad30005a2bf21.zip | |
WAGE: Moved patterns to WindowManager
Diffstat (limited to 'engines/wage/world.cpp')
| -rw-r--r-- | engines/wage/world.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index 954a425b7b..53fc1b4742 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -73,6 +73,8 @@ World::World(WageEngine *engine) { _weaponMenuDisabled = true; _engine = engine; + + _patterns = new Patterns; } World::~World() { @@ -88,8 +90,10 @@ World::~World() { for (uint i = 0; i < _orderedScenes.size(); i++) delete _orderedScenes[i]; - for (uint i = 0; i < _patterns.size(); i++) - free(_patterns[i]); + for (uint i = 0; i < _patterns->size(); i++) + free(_patterns->operator[](i)); + + delete _patterns; delete _globalScript; @@ -261,7 +265,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { byte *pattern = (byte *)malloc(8); res->read(pattern, 8); - _patterns.push_back(pattern); + _patterns->push_back(pattern); } delete res; @@ -274,7 +278,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { byte *pattern = (byte *)malloc(8); res->read(pattern, 8); - _patterns.push_back(pattern); + _patterns->push_back(pattern); } } delete res; |