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/saveload.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/saveload.cpp')
| -rw-r--r-- | engines/dreamweb/saveload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index 5ca8ce88ec..ceaac99ae1 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -80,7 +80,7 @@ void DreamGenContext::doLoad(int savegameId) { vSync(); dumpPointer(); dumpTextLine(); - RectWithCallback loadlist[] = { + RectWithCallback<DreamGenContext> loadlist[] = { { kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps }, { kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualLoad }, { kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot }, @@ -176,7 +176,7 @@ void DreamGenContext::saveGame() { dumpPointer(); dumpTextLine(); - RectWithCallback savelist[] = { + RectWithCallback<DreamGenContext> savelist[] = { { kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps }, { kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualSave }, { kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot }, @@ -267,7 +267,7 @@ void DreamGenContext::doSaveLoad() { showMainOps(); workToScreenCPP(); - RectWithCallback opsList[] = { + RectWithCallback<DreamGenContext> opsList[] = { { kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps }, { kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn }, { kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps }, @@ -367,7 +367,7 @@ void DreamGenContext::discOps() { workToScreenM(); data.byte(kGetback) = 0; - RectWithCallback discOpsList[] = { + RectWithCallback<DreamGenContext> discOpsList[] = { { kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame }, { kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame }, { kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps }, |