diff options
| author | Travis Howell | 2004-10-04 14:28:43 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-04 14:28:43 +0000 |
| commit | 4e268316d0f598b196ae05ec762b6987fe07b7a6 (patch) | |
| tree | e25717ede480231da720c47bab7f89f51bdb8e3f /scumm | |
| parent | 292bd1a62b4f28538f92f79c210ae17ebf350884 (diff) | |
| download | scummvm-rg350-4e268316d0f598b196ae05ec762b6987fe07b7a6.tar.gz scummvm-rg350-4e268316d0f598b196ae05ec762b6987fe07b7a6.tar.bz2 scummvm-rg350-4e268316d0f598b196ae05ec762b6987fe07b7a6.zip | |
Rename var and enable in COMI.
svn-id: r15410
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 10 | ||||
| -rw-r--r-- | scumm/scumm.h | 4 | ||||
| -rw-r--r-- | scumm/vars.cpp | 16 |
3 files changed, 15 insertions, 15 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a7f4361b72..666c2d8282 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -779,8 +779,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_V5_TALK_STRING_Y = 0xFF; - VAR_V6_SCREEN_WIDTH = 0xFF; - VAR_V6_SCREEN_HEIGHT = 0xFF; + VAR_ROOM_WIDTH = 0xFF; + VAR_ROOM_HEIGHT = 0xFF; VAR_V6_EMSSPACE = 0xFF; VAR_CAMERA_POS_Y = 0xFF; @@ -1846,9 +1846,9 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { loadRoomObjects(); - if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) { - VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth; - VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight; + if (VAR_ROOM_WIDTH != 0xFF && VAR_ROOM_HEIGHT != 0xFF) { + VAR(VAR_ROOM_WIDTH) = _roomWidth; + VAR(VAR_ROOM_HEIGHT) = _roomHeight; } VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2; diff --git a/scumm/scumm.h b/scumm/scumm.h index bf349b3ddc..7eb98975ef 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1271,8 +1271,8 @@ public: byte VAR_V5_TALK_STRING_Y; - byte VAR_V6_SCREEN_WIDTH; - byte VAR_V6_SCREEN_HEIGHT; + byte VAR_ROOM_WIDTH; + byte VAR_ROOM_HEIGHT; byte VAR_V6_EMSSPACE; byte VAR_CAMERA_POS_Y; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index f5bd093aec..2c02b9e3b2 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -154,8 +154,8 @@ void ScummEngine_v6::setupScummVars() { // Many vars are the same as in V5 & V6 games, so just call the inherited method first ScummEngine::setupScummVars(); - VAR_V6_SCREEN_WIDTH = 41; - VAR_V6_SCREEN_HEIGHT = 54; + VAR_ROOM_WIDTH = 41; + VAR_ROOM_HEIGHT = 54; VAR_LEFTBTN_HOLD = 74; VAR_RIGHTBTN_HOLD = 75; @@ -210,8 +210,8 @@ void ScummEngine_v72he::setupScummVars() { VAR_CURSORSTATE = 19; VAR_USERPUT = 20; VAR_ROOM = 21; - VAR_V6_SCREEN_WIDTH = 22; - VAR_V6_SCREEN_HEIGHT = 23; + VAR_ROOM_WIDTH = 22; + VAR_ROOM_HEIGHT = 23; VAR_CAMERA_POS_X = 24; VAR_CAMERA_MIN_X = 25; VAR_CAMERA_MAX_X = 26; @@ -278,8 +278,8 @@ void ScummEngine_v7::setupScummVars() { VAR_MOUSE_Y = 2; VAR_VIRT_MOUSE_X = 3; VAR_VIRT_MOUSE_Y = 4; - VAR_V6_SCREEN_WIDTH = 5; - VAR_V6_SCREEN_HEIGHT = 6; + VAR_ROOM_WIDTH = 5; + VAR_ROOM_HEIGHT = 6; VAR_CAMERA_POS_X = 7; VAR_CAMERA_POS_Y = 8; VAR_OVERRIDE = 9; @@ -378,8 +378,8 @@ void ScummEngine_v7::setupScummVars() { } void ScummEngine_v8::setupScummVars() { - // VAR_ROOM_HEIGHT = 1; - // VAR_ROOM_WIDTH = 2; + VAR_ROOM_WIDTH = 1; + VAR_ROOM_HEIGHT = 2; VAR_MOUSE_X = 3; VAR_MOUSE_Y = 4; |