aboutsummaryrefslogtreecommitdiff
path: root/engines/director/score.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/director/score.cpp')
-rw-r--r--engines/director/score.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 231cb41a88..662820840e 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "director/score.h"
#include "common/stream.h"
#include "common/debug.h"
#include "common/file.h"
@@ -28,12 +27,6 @@
#include "common/config-manager.h"
#include "common/unzip.h"
-#include "common/system.h"
-#include "director/dib.h"
-#include "director/resource.h"
-#include "director/lingo/lingo.h"
-#include "director/sound.h"
-
#include "graphics/palette.h"
#include "common/events.h"
#include "engines/util.h"
@@ -43,6 +36,12 @@
#include "graphics/fontman.h"
#include "graphics/fonts/bdf.h"
+#include "director/score.h"
+#include "director/images.h"
+#include "director/resource.h"
+#include "director/lingo/lingo.h"
+#include "director/sound.h"
+
namespace Director {
static byte defaultPalette[768] = {
@@ -1339,7 +1338,11 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
}
if (_vm->_currentScore->getArchive()->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
- img = new Image::BitmapDecoder();
+ if (_vm->getVersion() < 4) {
+ img = new BITDDecoder();
+ } else {
+ img = new Image::BitmapDecoder();
+ }
if (debugChannelSet(8, kDebugLoading)) {
Common::SeekableReadStream *s = _vm->_currentScore->getArchive()->getResource(MKTAG('B', 'I', 'T', 'D'), imgId);