diff options
| author | Travis Howell | 2006-03-14 12:06:37 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-14 12:06:37 +0000 |
| commit | be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942 (patch) | |
| tree | d5d6a02759ddcb0e4b4cbfefefb0ef90eeb98385 /engines/scumm/room.cpp | |
| parent | 806ee522d12af62720d1870528b28293934a113a (diff) | |
| download | scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.tar.gz scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.tar.bz2 scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.zip | |
Avoid all scumm var conflicts in C64 maniac
svn-id: r21277
Diffstat (limited to 'engines/scumm/room.cpp')
| -rw-r--r-- | engines/scumm/room.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index 3468b19875..b2df1e993d 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -156,8 +156,10 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { VAR(VAR_ROOM_HEIGHT) = _roomHeight; } - VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2; - VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2); + if (VAR_CAMERA_MIN_X != 0xFF) + VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2; + if (VAR_CAMERA_MAX_X != 0xFF) + VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2); if (_game.features & GF_NEW_CAMERA) { VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2; |