thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use kVerbVirtScreen were appropriate; removed unused param from initVirtScreen

Browse source 
svn-id: r17828
This commit is contained in:
Max Horn 2005-04-26 15:52:55 +00:00
parent 3a4dafeaa3
commit b56b84b145
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scumm/gfx.cpp
View file

@ -266,27 +266,27 @@ void ScummEngine::initScreens(int b, int h) {
// version display, etc.). I don't know about V7, maybe the same is the
// case there. If so, we could probably just remove it completely.
if (_version >= 7) {
initVirtScreen(kUnkVirtScreen, 0, (_screenHeight / 2) - 10, _screenWidth, 13, false, false);
initVirtScreen(kUnkVirtScreen, (_screenHeight / 2) - 10, _screenWidth, 13, false, false);
} else {
initVirtScreen(kUnkVirtScreen, 0, 80, _screenWidth, 13, false, false);
initVirtScreen(kUnkVirtScreen, 80, _screenWidth, 13, false, false);
}
}
if ((_platform == Common::kPlatformNES) && (h != _screenHeight)) {
adj = 16;
initVirtScreen(kUnkVirtScreen, 0, 0, _screenWidth, adj, false, false);
initVirtScreen(kUnkVirtScreen, 0, _screenWidth, adj, false, false);
}
initVirtScreen(kMainVirtScreen, 0, b + adj, _screenWidth, h - b, true, true);
initVirtScreen(kTextVirtScreen, 0, adj, _screenWidth, b, false, false);
initVirtScreen(kVerbVirtScreen, 0, h + adj, _screenWidth, _screenHeight - h - adj, false, false);
initVirtScreen(kMainVirtScreen, b + adj, _screenWidth, h - b, true, true);
initVirtScreen(kTextVirtScreen, adj, _screenWidth, b, false, false);
initVirtScreen(kVerbVirtScreen, h + adj, _screenWidth, _screenHeight - h - adj, false, false);
_screenB = b;
_screenH = h;
gdi.init();
}
void ScummEngine::initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs,
void ScummEngine::initVirtScreen(VirtScreenNumber slot, int top, int width, int height, bool twobufs,
bool scrollable) {
VirtScreen *vs = &virtscr[slot];
int size;
@ -664,7 +664,7 @@ void ScummEngine::initBGBuffers(int height) {
// Resize main virtual screen in V7 games. This is necessary
// because in V7, rooms may be higher than one screen, so we have
// to accomodate for that.
initVirtScreen(kMainVirtScreen, 0, virtscr[0].topline, _screenWidth, height, 1, 1);
initVirtScreen(kMainVirtScreen, virtscr[0].topline, _screenWidth, height, 1, 1);
}
if (_heversion >= 70)

14
scumm/script_v2.cpp
View file

@ -1041,7 +1041,7 @@ void ScummEngine_v2::o2_drawSentence() {
}
_string[2].charset = 1;
_string[2].ypos = virtscr[2].topline;
_string[2].ypos = virtscr[kVerbVirtScreen].topline;
_string[2].xpos = 0;
if (_platform == Common::kPlatformNES) {
_string[2].xpos = 16;
@ -1066,13 +1066,13 @@ void ScummEngine_v2::o2_drawSentence() {
}
if (_platform == Common::kPlatformNES) { // TODO - get multiline sentences working
sentenceline.top = virtscr[2].topline;
sentenceline.bottom = virtscr[2].topline + 16;
sentenceline.top = virtscr[kVerbVirtScreen].topline;
sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 16;
sentenceline.left = 16;
sentenceline.right = 255;
} else {
sentenceline.top = virtscr[2].topline;
sentenceline.bottom = virtscr[2].topline + 8;
sentenceline.top = virtscr[kVerbVirtScreen].topline;
sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 8;
sentenceline.left = 0;
sentenceline.right = 319;
}
@ -1546,8 +1546,8 @@ void ScummEngine_v2::setUserState(byte state) {
// Hide all verbs and inventory
Common::Rect rect;
rect.top = virtscr[2].topline;
rect.bottom = virtscr[2].topline + 8 * 88;
rect.top = virtscr[kVerbVirtScreen].topline;
rect.bottom = virtscr[kVerbVirtScreen].topline + 8 * 88;
if (_platform == Common::kPlatformNES) {
rect.left = 16;
rect.right = 255;

2
scumm/scumm.h
View file

@ -922,7 +922,7 @@ public:
protected:
void initScreens(int b, int h);
void initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs, bool scrollable);
void initVirtScreen(VirtScreenNumber slot, int top, int width, int height, bool twobufs, bool scrollable);
void initBGBuffers(int height);
void initCycl(const byte *ptr); // Color cycle

2
scumm/verbs.cpp
View file

@ -272,7 +272,7 @@ void ScummEngine_v2::redrawV2Inventory() {
// Clear on all invocations
inventoryBox.top = vs->topline + inventoryArea;
inventoryBox.bottom = vs->topline + virtscr[2].h;
inventoryBox.bottom = vs->topline + virtscr[kVerbVirtScreen].h;
inventoryBox.left = 0;
inventoryBox.right = vs->w;
restoreBG(inventoryBox);