diff options
| author | Max Horn | 2011-12-20 09:44:00 +0100 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-23 03:39:44 +0200 |
| commit | cdc6bc421bef6ed0119819a92fba1b2b9283ce17 (patch) | |
| tree | b29584366bf54f343b6cdd2c82c28fb965ead597 /engines/dreamweb/object.cpp | |
| parent | a4ffb8fe54c41c957f506c127c6aa30586769c52 (diff) | |
| download | scummvm-rg350-cdc6bc421bef6ed0119819a92fba1b2b9283ce17.tar.gz scummvm-rg350-cdc6bc421bef6ed0119819a92fba1b2b9283ce17.tar.bz2 scummvm-rg350-cdc6bc421bef6ed0119819a92fba1b2b9283ce17.zip | |
DREAMWEB: Turn RectWithCallback into template
Also moves checkCoords to DreamBase, adding a nasty cast to it. This is a
temporary HACK, which allows moving functions that use checkCoords to
DreamBase one at a time, instead of all at once (and at the same time as
checkCoords). This can be undone once everything using checkCoords has been
moved to DreamBase.
Diffstat (limited to 'engines/dreamweb/object.cpp')
| -rw-r--r-- | engines/dreamweb/object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index 54979309f4..1c1ae5b4a0 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -170,7 +170,7 @@ void DreamGenContext::examineOb(bool examineAgain) { switch (data.byte(kInvopen)) { case 0: { - RectWithCallback examList[] = { + RectWithCallback<DreamGenContext> examList[] = { { 273,320,157,198,&DreamGenContext::getBackFromOb }, { 260,300,0,44,&DreamGenContext::useObject }, { 210,254,0,44,&DreamGenContext::selectOpenOb }, @@ -184,7 +184,7 @@ void DreamGenContext::examineOb(bool examineAgain) { } case 1: { // Note: This table contains the non-constant _openChangeSize! - RectWithCallback invList1[] = { + RectWithCallback<DreamGenContext> invList1[] = { { 273,320,157,198,&DreamGenContext::getBackFromOb }, { 255,294,0,24,&DreamGenContext::dropObject }, { kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage }, @@ -197,7 +197,7 @@ void DreamGenContext::examineOb(bool examineAgain) { break; } default: { - RectWithCallback withList1[] = { + RectWithCallback<DreamGenContext> withList1[] = { { 273,320,157,198,&DreamGenContext::getBackFromOb }, { kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage }, { kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb }, |