thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Turn RectWithCallback into template

Browse source 
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.
This commit is contained in:
Max Horn 2011-12-20 09:44:00 +01:00 • committed by Filippos Karapetis
parent a4ffb8fe54
commit cdc6bc421b
8 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dreamweb/object.cpp
View file

@ -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 },