mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-12 22:51:11 +00:00
DREAMWEB: cleanup
This commit is contained in:
Max Horn
Filippos Karapetis
parent
cdc6bc421b
commit
ef98df5895
@ -242,6 +242,7 @@ public:
|
||||
void actualLoad();
|
||||
void loadPosition(unsigned int slot);
|
||||
void savePosition(unsigned int slot, const char *descbuf);
|
||||
void showDecisions();
|
||||
void loadSaveBox();
|
||||
void showNames();
|
||||
void checkInput();
|
||||
@ -458,6 +459,8 @@ public:
|
||||
void restoreAll();
|
||||
void redrawMainScrn();
|
||||
template <class T> void checkCoords(const RectWithCallback<T> *rectWithCallbacks);
|
||||
void newGame();
|
||||
void deleteTaken();
|
||||
|
||||
// from use.cpp
|
||||
void placeFreeObject(uint8 index);
|
||||
|
||||
@ -93,7 +93,7 @@ void DreamBase::addToPressList() {
|
||||
}
|
||||
|
||||
void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
|
||||
RectWithCallback<DreamGenContext> keypadList[] = {
|
||||
RectWithCallback<DreamBase> keypadList[] = {
|
||||
{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
|
||||
{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
|
||||
{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamBase::buttonThree },
|
||||
|
||||
@ -171,7 +171,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
|
||||
switch (data.byte(kInvopen)) {
|
||||
case 0: {
|
||||
RectWithCallback<DreamGenContext> examList[] = {
|
||||
{ 273,320,157,198,&DreamGenContext::getBackFromOb },
|
||||
{ 273,320,157,198,&DreamBase::getBackFromOb },
|
||||
{ 260,300,0,44,&DreamGenContext::useObject },
|
||||
{ 210,254,0,44,&DreamGenContext::selectOpenOb },
|
||||
{ 144,176,64,96,&DreamGenContext::setPickup },
|
||||
@ -185,7 +185,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
|
||||
case 1: {
|
||||
// Note: This table contains the non-constant _openChangeSize!
|
||||
RectWithCallback<DreamGenContext> invList1[] = {
|
||||
{ 273,320,157,198,&DreamGenContext::getBackFromOb },
|
||||
{ 273,320,157,198,&DreamBase::getBackFromOb },
|
||||
{ 255,294,0,24,&DreamGenContext::dropObject },
|
||||
{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
|
||||
{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
|
||||
@ -198,7 +198,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
|
||||
}
|
||||
default: {
|
||||
RectWithCallback<DreamGenContext> withList1[] = {
|
||||
{ 273,320,157,198,&DreamGenContext::getBackFromOb },
|
||||
{ 273,320,157,198,&DreamBase::getBackFromOb },
|
||||
{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
|
||||
{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
|
||||
{ 0,320,0,200,&DreamBase::blank },
|
||||
|
||||
@ -80,7 +80,7 @@ void DreamGenContext::doLoad(int savegameId) {
|
||||
vSync();
|
||||
dumpPointer();
|
||||
dumpTextLine();
|
||||
RectWithCallback<DreamGenContext> loadlist[] = {
|
||||
RectWithCallback<DreamBase> 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<DreamGenContext> savelist[] = {
|
||||
RectWithCallback<DreamBase> 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 },
|
||||
@ -644,6 +644,13 @@ void DreamGenContext::loadOld() {
|
||||
data.byte(kGetback) = 0;
|
||||
}
|
||||
|
||||
void DreamBase::showDecisions() {
|
||||
createPanel2();
|
||||
showOpBox();
|
||||
showFrame(tempGraphics(), kOpsx + 17, kOpsy + 13, 6, 0);
|
||||
underTextLine();
|
||||
}
|
||||
|
||||
void DreamBase::loadSaveBox() {
|
||||
loadIntoTemp("DREAMWEB.G08");
|
||||
}
|
||||
|
||||
@ -1386,7 +1386,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
|
||||
}
|
||||
}
|
||||
|
||||
void DreamGenContext::deleteTaken() {
|
||||
void DreamBase::deleteTaken() {
|
||||
const DynObject *extraObjects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
|
||||
DynObject *freeObjects = (DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
|
||||
for (size_t i = 0; i < kNumexobjects; ++i) {
|
||||
@ -1919,7 +1919,7 @@ void DreamGenContext::enterSymbol() {
|
||||
dumpPointer();
|
||||
dumpTextLine();
|
||||
dumpSymbol();
|
||||
RectWithCallback<DreamGenContext> symbolList[] = {
|
||||
RectWithCallback<DreamBase> symbolList[] = {
|
||||
{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamBase::quitSymbol },
|
||||
{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamBase::setTopLeft },
|
||||
{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamBase::setTopRight },
|
||||
@ -2634,7 +2634,7 @@ void DreamGenContext::useMenu() {
|
||||
dumpPointer();
|
||||
dumpMenu();
|
||||
dumpTextLine();
|
||||
RectWithCallback<DreamGenContext> menuList[] = {
|
||||
RectWithCallback<DreamBase> menuList[] = {
|
||||
{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamBase::quitKey },
|
||||
{ 0,320,0,200,&DreamBase::blank },
|
||||
{ 0xFFFF,0,0,0,0 }
|
||||
@ -3122,7 +3122,7 @@ void DreamBase::setBotRight() {
|
||||
data.byte(kSymbolbotdir) = 1;
|
||||
}
|
||||
|
||||
void DreamGenContext::newGame() {
|
||||
void DreamBase::newGame() {
|
||||
if (data.byte(kCommandtype) != 251) {
|
||||
data.byte(kCommandtype) = 251;
|
||||
commandOnly(47);
|
||||
@ -3630,13 +3630,6 @@ void DreamBase::underTextLine() {
|
||||
multiGet(textUnder(), data.byte(kTextaddressx), y, kUndertextsizex, kUndertextsizey);
|
||||
}
|
||||
|
||||
void DreamGenContext::showDecisions() {
|
||||
createPanel2();
|
||||
showOpBox();
|
||||
showFrame(tempGraphics(), kOpsx + 17, kOpsy + 13, 6, 0);
|
||||
underTextLine();
|
||||
}
|
||||
|
||||
void DreamBase::getUnderZoom() {
|
||||
multiGet(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
|
||||
}
|
||||
@ -3774,7 +3767,7 @@ void DreamGenContext::decide() {
|
||||
data.byte(kGetback) = 0;
|
||||
|
||||
RectWithCallback<DreamGenContext> decideList[] = {
|
||||
{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame },
|
||||
{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamBase::newGame },
|
||||
{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
|
||||
{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
|
||||
{ 0,320,0,200,&DreamBase::blank },
|
||||
@ -3854,7 +3847,7 @@ void DreamGenContext::talk() {
|
||||
void DreamGenContext::hangOnPQ() {
|
||||
data.byte(kGetback) = 0;
|
||||
|
||||
RectWithCallback<DreamGenContext> quitList[] = {
|
||||
RectWithCallback<DreamBase> quitList[] = {
|
||||
{ 273,320,157,198,&DreamBase::getBack1 },
|
||||
{ 0,320,0,200,&DreamBase::blank },
|
||||
{ 0xFFFF,0,0,0,0 }
|
||||
|
||||
@ -87,7 +87,6 @@
|
||||
SetObject *getSetAd(uint8 index) {
|
||||
return DreamBase::getSetAd(index);
|
||||
}
|
||||
void deleteTaken();
|
||||
bool finishedWalkingCPP();
|
||||
void finishedWalking();
|
||||
void checkOne();
|
||||
@ -235,7 +234,6 @@
|
||||
void realCredits();
|
||||
void runIntroSeq();
|
||||
void intro();
|
||||
void newGame();
|
||||
void pickupOb(uint8 command, uint8 pos);
|
||||
void initialInv();
|
||||
void walkIntoRoom();
|
||||
@ -287,7 +285,6 @@
|
||||
void set16ColPalette();
|
||||
void afterNewRoom();
|
||||
void madmanRun();
|
||||
void showDecisions();
|
||||
void decide();
|
||||
void talk();
|
||||
void discOps();
|
||||
|
||||
@ -1270,7 +1270,7 @@ void DreamGenContext::useDiary() {
|
||||
delPointer();
|
||||
data.byte(kGetback) = 0;
|
||||
|
||||
RectWithCallback<DreamGenContext> diaryList[] = {
|
||||
RectWithCallback<DreamBase> diaryList[] = {
|
||||
{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
|
||||
{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamBase::diaryKeyP },
|
||||
{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamBase::quitKey },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user