aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index a2badf8d68..56da24d0f4 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1232,7 +1232,9 @@ int ScummEngine::init(GameDetector &detector) {
loadCJKFont();
// Create the charset renderer
- if (_version <= 2)
+ if (_features & GF_NES)
+ _charset = new CharsetRendererNES(this, _language);
+ else if (_version <= 2)
_charset = new CharsetRendererV2(this, _language);
else if (_version == 3)
_charset = new CharsetRendererV3(this);
@@ -1500,8 +1502,10 @@ void ScummEngine::scummInit() {
clearDrawObjectQueue();
- if (_features & GF_NES)
+ if (_features & GF_NES) {
+ decodeNESBaseTiles();
cost_decodeNESCostumeGfx();
+ }
for (i = 0; i < 6; i++) {
if (_version == 3) { // FIXME - what is this?