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

DREAMWEB: Fix a regression in fillOpen() and remove the now unused getOpenedSize()

Browse source
This commit is contained in:
Filippos Karapetis 2011-12-26 16:52:31 +02:00
parent 1fef9d1f75
commit 3b9b4cb6ba
2 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engines/dreamweb/object.cpp
View file

@ -276,31 +276,6 @@ void DreamBase::getBackFromOb() {
blank(); blank();
} }
void DreamGenContext::getOpenedSize() {
//ah = getOpenedSlotSize();
//ah = getOpenedSlotCount();
// We need to call the ASM-style versions of get*Ad, as these also set
// bx and es
al = data.byte(kOpenedob);
switch (data.byte(kOpenedtype)) {
case 4:
getExAd();
ax = es.word(bx+7);
break;
case 2:
getFreeAd();
ax = es.word(bx+7);
break;
default:
getSetAd();
ax = es.word(bx+3);
break;
}
}
byte DreamBase::getOpenedSlotCount() { byte DreamBase::getOpenedSlotCount() {
byte obj = data.byte(kOpenedob); byte obj = data.byte(kOpenedob);
switch (data.byte(kOpenedtype)) { switch (data.byte(kOpenedtype)) {
@ -1092,7 +1067,7 @@ void DreamBase::fillOpen() {
for (uint8 i = 0; i < size; ++i) { for (uint8 i = 0; i < size; ++i) {
uint8 index = openInvList[2*i]; uint8 index = openInvList[2*i];
uint8 type = openInvList[2*i + 1]; uint8 type = openInvList[2*i + 1];
obToInv(index, type, kInventx + (i-1)*kItempicsize, kInventy + 96); obToInv(index, type, kInventx + i * kItempicsize, kInventy + 96);
} }
underTextLine(); underTextLine();
} }

1
engines/dreamweb/stubs.h
View file

@ -118,7 +118,6 @@
void triggerMessage(uint16 index); void triggerMessage(uint16 index);
void processTrigger(); void processTrigger();
bool execCommand(); bool execCommand();
void getOpenedSize();
bool checkObjectSizeCPP(); bool checkObjectSizeCPP();
void identifyOb(); void identifyOb();
void selectOb(); void selectOb();