libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

V2 Inventory scrolling, etc

Browse Source 
svn-id: r7817
This commit is contained in:
James Brown 2003-05-22 05:44:18 +00:00
parent 19bbee7843
commit 573678abc0
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/script_v2.cpp
View File

@ -938,7 +938,7 @@ void Scumm_v2::o2_drawSentence() {
sentenceline.top = virtscr[2].topline; sentenceline.top = virtscr[2].topline;
sentenceline.bottom = virtscr[2].topline + 8; sentenceline.bottom = virtscr[2].topline + 8;
sentenceline.left = 0; sentenceline.left = 0;
sentenceline.right = 200; sentenceline.right = 319;
restoreBG(sentenceline); restoreBG(sentenceline);
drawString(2); drawString(2);

36
scumm/verbs.cpp
View File

@ -33,32 +33,52 @@ void Scumm::checkV2Inventory(int x, int y) {
if ((y < virtscr[2].topline + 34) || !(_mouseButStat & MBS_LEFT_CLICK)) if ((y < virtscr[2].topline + 34) || !(_mouseButStat & MBS_LEFT_CLICK))
return; return;
if (x > 145 && x < 160) { // Inventory Arrows
if (y < virtscr[2].topline + 38) // Up arrow
_inventoryOffset-=2;
else if (y > virtscr[2].topline + 47) // Down arrow
_inventoryOffset+=2;
if (_inventoryOffset < 0)
_inventoryOffset = 0;
if (_inventoryOffset > (getInventoryCount(_scummVars[VAR_EGO])-2))
_inventoryOffset = (getInventoryCount(_scummVars[VAR_EGO])-2);
redrawV2Inventory();
}
object = ((y - virtscr[2].topline - 34) / 8) * 2; object = ((y - virtscr[2].topline - 34) / 8) * 2;
if (x > 150) if (x > 150)
object++; object++;
object = findInventory(_scummVars[VAR_EGO], object+1); object = findInventory(_scummVars[VAR_EGO], object+1+_inventoryOffset);
if (object > 0) { if (object > 0) {
runInputScript(3, object, 0); runInputScript(3, object, 0);
} }
} }
void Scumm::redrawV2Inventory() { void Scumm::redrawV2Inventory() {
int i, items = 0, curInventoryCount = 0; int i, items = 0;
bool alternate = false; bool alternate = false;
int max_inv = getInventoryCount(_scummVars[VAR_EGO]); int max_inv = getInventoryCount(_scummVars[VAR_EGO]);
ScummVM::Rect inventoryBox;
if (!(_userState & 64)) // Clear on all invocations, so hiding works properly
inventoryBox.top = virtscr[2].topline + 32;
inventoryBox.bottom = virtscr[2].topline + virtscr[2].height;
inventoryBox.left = 0;
inventoryBox.right = 319;
restoreBG(inventoryBox);
if (!(_userState & 64)) // Don't draw inventory unless active
return; return;
if (curInventoryCount > max_inv)
curInventoryCount = max_inv;
_string[1].charset = 1; _string[1].charset = 1;
_string[1].color = 5; _string[1].color = 5;
items = 0; items = 0;
for (i = curInventoryCount + 1; i <= max_inv; i++) { for (i = _inventoryOffset + 1; i <= max_inv; i++) {
int obj = findInventory(_scummVars[VAR_EGO], i); int obj = findInventory(_scummVars[VAR_EGO], i);
if ((obj == 0) || (items == 4)) break; if ((obj == 0) || (items == 4)) break;
@ -76,7 +96,7 @@ void Scumm::redrawV2Inventory() {
alternate = !alternate; alternate = !alternate;
} }
if (curInventoryCount > 0) { // Draw Up Arrow if (_inventoryOffset > 0) { // Draw Up Arrow
_string[1].xpos = 145; _string[1].xpos = 145;
_string[1].ypos = virtscr[2].topline + 32; _string[1].ypos = virtscr[2].topline + 32;
_messagePtr = (const byte *)"\1\2"; _messagePtr = (const byte *)"\1\2";