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

7
engines/dreamweb/object.cpp
View file

@ -79,10 +79,6 @@ void DreamGenContext::wornError() {
workToScreenM();
}
void DreamGenContext::makeWorn() {
makeWorn((DynObject *)es.ptr(bx, sizeof(DynObject)));
}
void DreamGenContext::makeWorn(DynObject *object) {
object->id[0] = 'W'-'A';
object->id[1] = 'E'-'A';
@ -419,8 +415,7 @@ void DreamGenContext::selectOb() {
void DreamGenContext::setPickup() {
if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
// The original called getAnyAd() here. However, since object types
// 1 and 3 are excluded, the resulting object is a DynObject
// Object types 1 and 3 are excluded, so the resulting object is a DynObject
uint8 dummy;
DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
if (object->mapad[0] == 4) {