diff options
author | Willem Jan Palenstijn | 2011-12-27 01:43:54 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-27 01:44:54 +0100 |
commit | 0be53a88d626b484b9db30f3d89534d5d237a073 (patch) | |
tree | d6d3d6fe8533c16425276069fed7ba9647de4bc6 /engines/dreamweb/object.cpp | |
parent | 4027e635d50b510e322480c039bcc39449d096df (diff) | |
download | scummvm-rg350-0be53a88d626b484b9db30f3d89534d5d237a073.tar.gz scummvm-rg350-0be53a88d626b484b9db30f3d89534d5d237a073.tar.bz2 scummvm-rg350-0be53a88d626b484b9db30f3d89534d5d237a073.zip |
DREAMWEB: Move remaining use functions to DreamBase
Diffstat (limited to 'engines/dreamweb/object.cpp')
-rw-r--r-- | engines/dreamweb/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index 31a5af0bb5..65f45bd499 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -116,7 +116,7 @@ void DreamBase::obIcons() { showFrame(engine->icons2(), 260, 1, 1, 0); } -void DreamGenContext::examineOb(bool examineAgain) { +void DreamBase::examineOb(bool examineAgain) { data.byte(kPointermode) = 0; data.word(kTimecount) = 0; @@ -156,9 +156,9 @@ void DreamGenContext::examineOb(bool examineAgain) { switch (data.byte(kInvopen)) { case 0: { - RectWithCallback<DreamGenContext> examList[] = { + RectWithCallback<DreamBase> examList[] = { { 273,320,157,198,&DreamBase::getBackFromOb }, - { 260,300,0,44,&DreamGenContext::useObject }, + { 260,300,0,44,&DreamBase::useObject }, { 210,254,0,44,&DreamBase::selectOpenOb }, { 144,176,64,96,&DreamBase::setPickup }, { 0,50,50,200,&DreamBase::examineInventory }, @@ -183,10 +183,10 @@ void DreamGenContext::examineOb(bool examineAgain) { break; } default: { - RectWithCallback<DreamGenContext> withList1[] = { + RectWithCallback<DreamBase> withList1[] = { { 273,320,157,198,&DreamBase::getBackFromOb }, { kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage }, - { kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb }, + { kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamBase::selectOb }, { 0,320,0,200,&DreamBase::blank }, { 0xFFFF,0,0,0,0 } }; @@ -354,7 +354,7 @@ ObjectRef DreamBase::findInvPos() { return _ryanInvList[invPos]; } -void DreamGenContext::selectOb() { +void DreamBase::selectOb() { ObjectRef objectId = findInvPos(); if (objectId._index == 255) { blank(); |