aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-10 21:49:59 +0000
committerMax Horn2003-05-10 21:49:59 +0000
commitacb35fc915284cb3b194ba8864eb24e39fff992e (patch)
treedfc1dd77fcda48c14ee8ea0e898cdbd023a14344 /scumm/script_v5.cpp
parente5fe73726a554d312f30682508d2474c8734b0ef (diff)
downloadscummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.tar.gz
scummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.tar.bz2
scummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.zip
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
Diffstat (limited to 'scumm/script_v5.cpp')
-rw-r--r--scumm/script_v5.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index c79c60e8fc..59aef91b51 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1660,14 +1660,14 @@ void Scumm_v5::o5_roomOps() {
a = getVarOrDirectWord(0x80);
b = getVarOrDirectWord(0x40);
}
- if (a < (_realWidth / 2))
- a = (_realWidth / 2);
- if (b < (_realWidth / 2))
- b = (_realWidth / 2);
- if (a > _scrWidth - (_realWidth / 2))
- a = _scrWidth - (_realWidth / 2);
- if (b > _scrWidth - (_realWidth / 2))
- b = _scrWidth - (_realWidth / 2);
+ if (a < (_screenWidth / 2))
+ a = (_screenWidth / 2);
+ if (b < (_screenWidth / 2))
+ b = (_screenWidth / 2);
+ if (a > _roomWidth - (_screenWidth / 2))
+ a = _roomWidth - (_screenWidth / 2);
+ if (b > _roomWidth - (_screenWidth / 2))
+ b = _roomWidth - (_screenWidth / 2);
VAR(VAR_CAMERA_MIN_X) = a;
VAR(VAR_CAMERA_MAX_X) = b;
break;
@@ -1695,7 +1695,7 @@ void Scumm_v5::o5_roomOps() {
a = getVarOrDirectWord(0x80);
b = getVarOrDirectWord(0x40);
}
- initScreens(0, a, _realWidth, b);
+ initScreens(0, a, _screenWidth, b);
break;
case 4: /* set palette color */
if (_features & GF_SMALL_HEADER) {