aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorMax Horn2007-09-08 11:15:27 +0000
committerMax Horn2007-09-08 11:15:27 +0000
commit0cccbb29d63a03582b7c3cd89265296a46530414 (patch)
treede32fb80d0d81baa413318201cb56d7281690c9b /engines/scumm/script_v2.cpp
parent89bbbe53ac9adc19bc33e7895ca1eb32f75607fe (diff)
downloadscummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.gz
scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.bz2
scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.zip
Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
Diffstat (limited to 'engines/scumm/script_v2.cpp')
-rw-r--r--engines/scumm/script_v2.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 767d9495cc..532acc98a3 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1053,9 +1053,9 @@ void ScummEngine_v2::o2_drawSentence() {
}
_string[2].charset = 1;
- _string[2].ypos = virtscr[kVerbVirtScreen].topline;
+ _string[2].ypos = _virtscr[kVerbVirtScreen].topline;
_string[2].xpos = 0;
- _string[2].right = virtscr[kVerbVirtScreen].w - 1;
+ _string[2].right = _virtscr[kVerbVirtScreen].w - 1;
if (_game.platform == Common::kPlatformNES) {
_string[2].xpos = 16;
_string[2].color = 0;
@@ -1087,15 +1087,15 @@ void ScummEngine_v2::o2_drawSentence() {
string[i] = 0;
if (_game.platform == Common::kPlatformNES) {
- sentenceline.top = virtscr[kVerbVirtScreen].topline;
- sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 16;
+ sentenceline.top = _virtscr[kVerbVirtScreen].topline;
+ sentenceline.bottom = _virtscr[kVerbVirtScreen].topline + 16;
sentenceline.left = 16;
- sentenceline.right = virtscr[kVerbVirtScreen].w - 1;
+ sentenceline.right = _virtscr[kVerbVirtScreen].w - 1;
} else {
- sentenceline.top = virtscr[kVerbVirtScreen].topline;
- sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 8;
+ sentenceline.top = _virtscr[kVerbVirtScreen].topline;
+ sentenceline.bottom = _virtscr[kVerbVirtScreen].topline + 8;
sentenceline.left = 0;
- sentenceline.right = virtscr[kVerbVirtScreen].w - 1;
+ sentenceline.right = _virtscr[kVerbVirtScreen].w - 1;
}
restoreBackground(sentenceline);
@@ -1590,9 +1590,9 @@ void ScummEngine_v2::setUserState(byte state) {
// Hide all verbs and inventory
Common::Rect rect;
- rect.top = virtscr[kVerbVirtScreen].topline;
- rect.bottom = virtscr[kVerbVirtScreen].topline + 8 * 88;
- rect.right = virtscr[kVerbVirtScreen].w - 1;
+ rect.top = _virtscr[kVerbVirtScreen].topline;
+ rect.bottom = _virtscr[kVerbVirtScreen].topline + 8 * 88;
+ rect.right = _virtscr[kVerbVirtScreen].w - 1;
if (_game.platform == Common::kPlatformNES) {
rect.left = 16;
} else {