diff options
| author | Filippos Karapetis | 2011-12-24 00:34:56 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-24 00:37:13 +0200 |
| commit | f6d63ae6a8adeb182d404274b856c03bb40bae4a (patch) | |
| tree | 0e2785bfaac283c897280a20589d7f772535a4e1 /engines/dreamweb/object.cpp | |
| parent | d40201103e277dcaa55b98bca46157b80624d417 (diff) | |
| download | scummvm-rg350-f6d63ae6a8adeb182d404274b856c03bb40bae4a.tar.gz scummvm-rg350-f6d63ae6a8adeb182d404274b856c03bb40bae4a.tar.bz2 scummvm-rg350-f6d63ae6a8adeb182d404274b856c03bb40bae4a.zip | |
DREAMWEB: Use the C++ versions of getAnyAd and makeWorn in some places
This allows us to remove the ASM style version of makeWorn()
Diffstat (limited to 'engines/dreamweb/object.cpp')
| -rw-r--r-- | engines/dreamweb/object.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index 207f4889db..cdd612001f 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -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) { |