diff options
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 22 |
2 files changed, 11 insertions, 16 deletions
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 1f1b81cd60..57316bd362 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -34,7 +34,6 @@ namespace DreamGen { static const uint16 offset_money1poke = 0x054e; static const uint16 offset_talklist = 0x0448; -static const uint16 offset_decidelist = 0x05d9; static const uint16 offset_discopslist = 0x05aa; static const uint16 offset_openchangesize = 0x0446; static const uint16 offset_operand1 = 0x0524; @@ -563,7 +562,6 @@ public: void adjustUp(); void fadeScreenDownHalf(); void fadeDownMon(); - void printmessage2(); void bartender(); void outOfOpen(); void dirCom(); @@ -595,6 +593,7 @@ public: void pickupConts(); void allPalette(); void cantDrop(); + void nextColon(); void findInvPos(); void rollEndCredits(); void getKeyAndLogo(); @@ -617,7 +616,7 @@ public: void soldier1(); void getUnderCentre(); void showKeys(); - void nextColon(); + void printmessage2(); void hangOnPQ(); void findOpenPos(); void describeOb(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index e66a0816de..a56d63e1a5 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -1728,17 +1728,6 @@ void DreamGenContext::checkCoords() { checkCoords(discOpsList); break; } - case offset_decidelist: { - RectWithCallback decideList[] = { - { kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame }, - { kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn }, - { kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld }, - { 0,320,0,200,&DreamGenContext::blank }, - { 0xFFFF,0,0,0,0 } - }; - checkCoords(decideList); - break; - } default: ::error("Unimplemented checkcoords() call"); } @@ -3964,6 +3953,14 @@ void DreamGenContext::decide() { fadeScreenUp(); data.byte(kGetback) = 0; + RectWithCallback decideList[] = { + { kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame }, + { kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn }, + { kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld }, + { 0,320,0,200,&DreamGenContext::blank }, + { 0xFFFF,0,0,0,0 } + }; + do { if (data.byte(kQuitrequested) != 0) return; @@ -3974,8 +3971,7 @@ void DreamGenContext::decide() { dumpPointer(); dumpTextLine(); delPointer(); - bx = offset_decidelist; - checkCoords(); + checkCoords(decideList); } while (!data.byte(kGetback)); if (data.byte(kGetback) != 4) |