[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.437,2.438 script_v2.cpp,2.275,2.276 scumm.h,1.602,1.603 verbs.cpp,1.132,1.133
Max Horn
fingolfin at users.sourceforge.net
Tue Apr 26 08:54:59 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.207,1.208
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.36,2.37 intern.h,2.461,2.462 saveload.cpp,1.208,1.209 scumm.h,1.600,1.601
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4269
Modified Files:
gfx.cpp script_v2.cpp scumm.h verbs.cpp
Log Message:
Use kVerbVirtScreen were appropriate; removed unused param from initVirtScreen
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.437
retrieving revision 2.438
diff -u -d -r2.437 -r2.438
--- gfx.cpp 26 Apr 2005 13:16:02 -0000 2.437
+++ gfx.cpp 26 Apr 2005 15:52:54 -0000 2.438
@@ -266,27 +266,27 @@
// 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 @@
// 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)
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.275
retrieving revision 2.276
diff -u -d -r2.275 -r2.276
--- script_v2.cpp 20 Apr 2005 23:53:28 -0000 2.275
+++ script_v2.cpp 26 Apr 2005 15:52:55 -0000 2.276
@@ -1041,7 +1041,7 @@
}
_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 @@
}
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 @@
// 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;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -d -r1.602 -r1.603
--- scumm.h 26 Apr 2005 15:42:35 -0000 1.602
+++ scumm.h 26 Apr 2005 15:52:55 -0000 1.603
@@ -922,7 +922,7 @@
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
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- verbs.cpp 26 Apr 2005 09:21:54 -0000 1.132
+++ verbs.cpp 26 Apr 2005 15:52:55 -0000 1.133
@@ -272,7 +272,7 @@
// 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);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.207,1.208
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.36,2.37 intern.h,2.461,2.462 saveload.cpp,1.208,1.209 scumm.h,1.600,1.601
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list