diff options
| author | Max Horn | 2002-09-21 16:20:52 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-21 16:20:52 +0000 |
| commit | 6cfcd04682da537c3d0afe7356f089f8ccd9c207 (patch) | |
| tree | c8ff637a5dc7fa9caae39ab9556b2f6a61a085cf | |
| parent | ae353fae18c274cc70471cdcbd22deee01d22e1c (diff) | |
| download | scummvm-rg350-6cfcd04682da537c3d0afe7356f089f8ccd9c207.tar.gz scummvm-rg350-6cfcd04682da537c3d0afe7356f089f8ccd9c207.tar.bz2 scummvm-rg350-6cfcd04682da537c3d0afe7356f089f8ccd9c207.zip | |
trivial cleanup
svn-id: r4988
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 11 | ||||
| -rw-r--r-- | scumm/string.cpp | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 08d74d5788..a476556e8f 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -71,7 +71,7 @@ void Scumm::initScreens(int a, int b, int w, int h) } initVirtScreen(0, 0, b, _realWidth, h - b, true, true); initVirtScreen(1, 0, 0, _realWidth, b, false, false); - initVirtScreen(2, 0, h, _realWidth, _realHeight - h, false, false); //ender + initVirtScreen(2, 0, h, _realWidth, _realHeight - h, false, false); _screenB = b; _screenH = h; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 030d7552df..674d9228aa 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -92,8 +92,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) if (_gameId == GID_ZAK256) { // FmTowns is 320x240 _realWidth = 320; _realHeight = 240; - } - else if (_gameId == GID_CMI) { + } else if (_gameId == GID_CMI) { _realWidth = 640; _realHeight = 480; } else { @@ -583,15 +582,13 @@ void Scumm::startScene(int room, Actor * a, int objectNr) _vars[VAR_V6_SCREEN_HEIGHT] = _scrHeight; } + _vars[VAR_CAMERA_MIN_X] = _realWidth / 2; + _vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2); + if (_features & GF_AFTER_V7) { - _vars[VAR_CAMERA_MIN_X] = _realWidth / 2; - _vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2); _vars[VAR_CAMERA_MIN_Y] = _realHeight / 2; _vars[VAR_CAMERA_MAX_Y] = _scrHeight - (_realHeight / 2); setCameraAt(_realWidth / 2, _realHeight / 2); - } else { - _vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2); - _vars[VAR_CAMERA_MIN_X] = _realWidth / 2; } if (_roomResource == 0) diff --git a/scumm/string.cpp b/scumm/string.cpp index cd74b7658c..dbf1017443 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -226,7 +226,6 @@ void Scumm::CHARSET_1() string[0].ypos = 1; if (string[0].ypos < camera._cur.y - (_realHeight / 2)) - string[0].ypos = camera._cur.y - (_realHeight / 2); s = a->scalex * a->new_2 / 0xFF; |