[Scummvm-cvs-logs] CVS: scummvm/scumm verbs.cpp,1.116,1.117
kirben
kirben at users.sourceforge.net
Tue Mar 15 20:25:18 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/scumm
Modified Files:
verbs.cpp
Log Message:
Last line of verbs work in NES maniac now.
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- verbs.cpp 16 Mar 2005 02:14:35 -0000 1.116
+++ verbs.cpp 16 Mar 2005 04:23:52 -0000 1.117
@@ -193,11 +193,12 @@
}
void ScummEngine::checkV2Inventory(int x, int y) {
+ int inventoryArea = (_features & GF_NES) ? 48: 32;
int object = 0;
y -= virtscr[kVerbVirtScreen].topline;
- if ((y < 34) || !(_mouseButStat & MBS_LEFT_CLICK))
+ if ((y < inventoryArea) || !(_mouseButStat & MBS_LEFT_CLICK))
return;
if (v2_mouseover_boxes[kInventoryUpArrow].rect.contains(x, y)) {
@@ -232,6 +233,7 @@
int i;
int max_inv;
Common::Rect inventoryBox;
+ int inventoryArea = (_features & GF_NES) ? 48: 32;
v2_mouseover_box = -1;
@@ -239,7 +241,7 @@
return;
// Clear on all invocations
- inventoryBox.top = vs->topline + 32;
+ inventoryBox.top = vs->topline + inventoryArea;
inventoryBox.bottom = vs->topline + virtscr[2].h;
inventoryBox.left = 0;
inventoryBox.right = vs->w;
@@ -346,10 +348,12 @@
} else if (_mouseButStat & MBS_MOUSE_MASK) {
VirtScreen *zone = findVirtScreen(_mouse.y);
byte code = _mouseButStat & MBS_LEFT_CLICK ? 1 : 2;
+ int inventoryArea = (_features & GF_NES) ? 48: 32;
+
if (_version <= 2 && zone->number == 2 && _mouse.y <= zone->topline + 8) {
// Click into V2 sentence line
runInputScript(5, 0, 0);
- } else if (_version <= 2 && zone->number == 2 && _mouse.y > zone->topline + 32) {
+ } else if (_version <= 2 && zone->number == 2 && _mouse.y > zone->topline + inventoryArea) {
// Click into V2 inventory
checkV2Inventory(_mouse.x, _mouse.y);
} else {
More information about the Scummvm-git-logs
mailing list