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

DREAMWEB: Use the C++ versions of getAnyAd and makeWorn in some places

Browse source 
This allows us to remove the ASM style version of makeWorn()
This commit is contained in:
Filippos Karapetis 2011-12-24 00:34:56 +02:00
parent d40201103e
commit f6d63ae6a8
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/dreamweb/use.cpp
View file

@ -363,8 +363,8 @@ void DreamGenContext::wearWatch() {
showFirstUse();
data.byte(kWatchon) = 1;
data.byte(kGetback) = 1;
getAnyAd();
makeWorn();
uint8 dummy;
makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
}
}
@ -377,8 +377,8 @@ void DreamGenContext::wearShades() {
data.byte(kShadeson) = 1;
showFirstUse();
data.byte(kGetback) = 1;
getAnyAd();
makeWorn();
uint8 dummy;
makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
}
}
@ -1027,13 +1027,13 @@ void DreamGenContext::useCart() {
}
void DreamGenContext::useTrainer() {
// TODO: Use the C++ version of getAnyAd()
getAnyAd();
if (es.byte(bx + 2) != 4) {
uint8 dummy;
DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
if (object->mapad[0] != 4) {
notHeldError();
} else {
data.byte(kProgresspoints)++;
makeWorn();
makeWorn(object);
showSecondUse();
putBackObStuff();
}