diff options
author | Filippos Karapetis | 2011-12-25 16:58:58 -0800 |
---|---|---|
committer | Filippos Karapetis | 2011-12-25 16:58:58 -0800 |
commit | 9a89f8884c0da0ee7c979d6df19969713fa16bf5 (patch) | |
tree | ab7b16fe71afdf8351905f0325f60e8609dfc6e2 /engines/dreamweb/object.cpp | |
parent | 7945a0fbb0ee3ec89d2b4e51d130f47b9717bfd3 (diff) | |
parent | a4643a0484fe1f54a2cc60ad146cf459012bd0f1 (diff) | |
download | scummvm-rg350-9a89f8884c0da0ee7c979d6df19969713fa16bf5.tar.gz scummvm-rg350-9a89f8884c0da0ee7c979d6df19969713fa16bf5.tar.bz2 scummvm-rg350-9a89f8884c0da0ee7c979d6df19969713fa16bf5.zip |
Merge pull request #153 from fingolfin/dreamweb-cleanup
Dreamweb: Port rollEm() to C++, remove dead code
Diffstat (limited to 'engines/dreamweb/object.cpp')
-rw-r--r-- | engines/dreamweb/object.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index 8e202a0ed0..7864b2aa25 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -58,10 +58,6 @@ void DreamBase::fillRyan() { showRyanPage(); } -void DreamGenContext::isItWorn() { - flags._z = isItWorn((const DynObject *)es.ptr(bx, sizeof(DynObject))); -} - bool DreamBase::isItWorn(const DynObject *object) { return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A'); } @@ -151,7 +147,7 @@ void DreamGenContext::examineOb(bool examineAgain) { data.byte(kCommandtype) = 255; readMouse(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); examineAgain = false; } @@ -255,7 +251,7 @@ void DreamGenContext::inventory() { openInv(); readMouse(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); data.byte(kOpenedob) = 255; examineOb(false); @@ -754,10 +750,6 @@ void DreamBase::dropObject() { object->currentLocation = data.byte(kReallocation); } -void DreamGenContext::checkObjectSize() { - al = checkObjectSizeCPP() ? 0 : 1; -} - bool DreamGenContext::checkObjectSizeCPP() { byte containerSize = getOpenedSlotSize(); DynObject *object = getEitherAdCPP(); @@ -816,7 +808,7 @@ void DreamGenContext::selectOpenOb() { underTextLine(); readMouse(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); } @@ -867,7 +859,7 @@ void DreamGenContext::swapWithInv() { fillRyan(); readMouse(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); } @@ -934,7 +926,7 @@ void DreamGenContext::useOpened() { readMouse(); useOpened(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); } @@ -992,7 +984,7 @@ void DreamGenContext::outOfOpen() { readMouse(); useOpened(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); } @@ -1062,7 +1054,7 @@ void DreamGenContext::swapWithOpen() { readMouse(); useOpened(); showPointer(); - workToScreenCPP(); + workToScreen(); delPointer(); } |