libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-01 15:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: More work on inToInv and outOfInv

Browse Source
This commit is contained in:
Filippos Karapetis 2011-12-19 23:47:06 +02:00
parent bdf14ed598
commit 5a3deea58e
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engines/dreamweb/object.cpp
View File

@ -568,21 +568,19 @@ void DreamGenContext::inToInv() {
return;
}
findInvPos();
ax = es.word(bx);
uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
if (al != 255) {
if ((subject & 0xFF) != 255) {
swapWithInv();
return;
}
al = data.byte(kItemframe);
ah = data.byte(kObjecttype);
subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
data.byte(kCommandtype) = 220;
data.word(kOldsubject) = ax;
data.word(kOldsubject) = subject;
commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@ -603,10 +601,9 @@ void DreamGenContext::inToInv() {
}
void DreamGenContext::outOfInv() {
findInvPos();
ax = es.word(bx);
uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
if (al == 255) {
if ((subject & 0xFF) == 255) {
blank();
return;
}
@ -616,11 +613,13 @@ void DreamGenContext::outOfInv() {
return;
}
if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
data.byte(kCommandtype) = 221;
data.word(kOldsubject) = ax;
commandWithOb(36, ah, al);
data.word(kOldsubject) = subject;
byte type = subject >> 8;
byte frame = subject & 0xFF;
commandWithOb(36, type, frame);
if (data.word(kMousebutton) == data.word(kOldbutton))
return; // notletgo
@ -630,10 +629,9 @@ void DreamGenContext::outOfInv() {
delPointer();
data.byte(kPickup) = 1;
findInvPos();
ax = es.word(bx);
data.byte(kItemframe) = al;
data.byte(kObjecttype) = ah;
subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
data.byte(kObjecttype) = subject >> 8;
data.byte(kItemframe) = subject & 0xFF;
DynObject *object = getExAd(data.byte(kItemframe));
object->mapad[0] = 20;
object->mapad[1] = 255;