aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-26 01:47:40 +0000
committerMax Horn2002-12-26 01:47:40 +0000
commita43355a1bfedcf661f4bc75b396c9e499a3bf812 (patch)
tree7b6af355d268df341fcd609d47962560a4fbdd8f /scumm/scummvm.cpp
parent7e7be4f6f3911c428449c727caa06a550fec6e3a (diff)
downloadscummvm-rg350-a43355a1bfedcf661f4bc75b396c9e499a3bf812.tar.gz
scummvm-rg350-a43355a1bfedcf661f4bc75b396c9e499a3bf812.tar.bz2
scummvm-rg350-a43355a1bfedcf661f4bc75b396c9e499a3bf812.zip
reuse the old (ugly nasty dreaded) string system for V8, too (by supplying a NUT based CharsetRenderer)
svn-id: r6162
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 4e45dc9dc6..4eb975589e 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -207,8 +207,16 @@ void Scumm::scummInit()
else
_resourceHeaderSize = 8;
+ if (_features & GF_AFTER_V7) {
+ initScreens(0, 0, _realWidth, _realHeight);
+ } else {
+ initScreens(0, 16, _realWidth, 144);
+ }
+
if (_features & GF_OLD256)
_charset = new CharsetRendererOld256(this);
+ else if (_features & GF_AFTER_V8)
+ _charset = new CharsetRendererNut(this);
else
_charset = new CharsetRendererClassic(this);
@@ -217,12 +225,6 @@ void Scumm::scummInit()
if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8))
loadCharset(1);
- if (_features & GF_AFTER_V7) {
- initScreens(0, 0, _realWidth, _realHeight);
- } else {
- initScreens(0, 16, _realWidth, 144);
- }
-
setShake(0);
setupCursor();