diff options
| author | Walter van Niftrik | 2016-03-26 16:27:51 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | bd588d96155d2b8626d8f760d4bb41fba60efc8e (patch) | |
| tree | 8639bd761c6aafa8d3fa7f08c72ccb840b4e5c8c /engines/adl/hires1.cpp | |
| parent | aa661fae5c3a6be2d09a0a6632770131ff02c550 (diff) | |
| download | scummvm-rg350-bd588d96155d2b8626d8f760d4bb41fba60efc8e.tar.gz scummvm-rg350-bd588d96155d2b8626d8f760d4bb41fba60efc8e.tar.bz2 scummvm-rg350-bd588d96155d2b8626d8f760d4bb41fba60efc8e.zip | |
ADL: Use HashMaps for room/global pics
Diffstat (limited to 'engines/adl/hires1.cpp')
| -rw-r--r-- | engines/adl/hires1.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp index b191afd12c..4161bfed05 100644 --- a/engines/adl/hires1.cpp +++ b/engines/adl/hires1.cpp @@ -166,13 +166,11 @@ void HiRes1Engine::init() { // Load picture data from executable stream->seek(IDI_HR1_OFS_PICS); - for (uint i = 0; i < IDI_HR1_NUM_PICS; ++i) { - struct Picture pic; + for (uint i = 1; i <= IDI_HR1_NUM_PICS; ++i) { byte block = stream->readByte(); Common::String name = Common::String::format("BLOCK%i", block); uint16 offset = stream->readUint16LE(); - pic.data = _files->getDataBlock(name, offset); - _pictures.push_back(pic); + _pictures[i] = _files->getDataBlock(name, offset); } // Load commands from executable @@ -265,7 +263,7 @@ void HiRes1Engine::restartGame() { } void HiRes1Engine::drawPic(byte pic, Common::Point pos) const { - _graphics->drawPic(*_pictures[pic].data->createReadStream(), pos, 0x7f); + _graphics->drawPic(*_pictures[pic]->createReadStream(), pos, 0x7f); } void HiRes1Engine::printString(const Common::String &str) { |