aboutsummaryrefslogtreecommitdiff
path: root/engines/director/director.cpp
diff options
context:
space:
mode:
authorIskrich2016-05-17 01:34:55 +0300
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commit75a01e0ea096c17bb6809140c3c69026362ccbe2 (patch)
tree8ad673c3272bf18d1af5928e434152056b839469 /engines/director/director.cpp
parentacc0d70054f34f8acd2cc2e4647156c238cd2181 (diff)
downloadscummvm-rg350-75a01e0ea096c17bb6809140c3c69026362ccbe2.tar.gz
scummvm-rg350-75a01e0ea096c17bb6809140c3c69026362ccbe2.tar.bz2
scummvm-rg350-75a01e0ea096c17bb6809140c3c69026362ccbe2.zip
DIRECTOR: Refactoring palette loading
Diffstat (limited to 'engines/director/director.cpp')
-rw-r--r--engines/director/director.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index e06459144b..0ddb8a7350 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -54,11 +54,11 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
//FIXME
RIFFArchive riff;
riff.openFile("bookshelf_example.mmm");
- Common::SeekableReadStream *dib = riff.getResource(1145651744, 1103);
- Common::SeekableReadStream *pal = riff.getResource(1129076052, 1025);
Director::DIBDecoder img;
- img.loadPalette(*pal);
+ Common::SeekableReadStream *dib = riff.getResource(MKTAG('D', 'I', 'B', ' '), 1103);
img.loadStream(*dib);
+ Common::SeekableReadStream *pal = riff.getResource(MKTAG('C', 'L', 'U', 'T'), 1025);
+ img.loadPalette(*pal);
}
DirectorEngine::~DirectorEngine() {