Skip to content

Commit

Permalink
DREAMWEB: Remove dead code and move most functions to DreamBase
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluegr
bluegr committed Dec 26, 2011
1 parent 0117fc4 commit 4c66f74
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 162 deletions.
35 changes: 35 additions & 0 deletions engines/dreamweb/dreambase.h
View file
Expand Up @@ -595,6 +595,41 @@ class DreamBase : public SegmentManager {
void errorMessage2();
void errorMessage3();
void decide();
void screenUpdate();
void mainScreen();
void walkAndExamine();
void autoLook();
void dumpWatch();
void watchCount();
void afterNewRoom();
void examineOb(bool examineAgain = true);
void walkIntoRoom();
void doLook();
void startup1();
void quickQuit();
void readOneBlock();
void seeCommandTail();
void quickQuit2();
void width160();
bool checkIfPerson(uint8 x, uint8 y);
bool checkIfFree(uint8 x, uint8 y);
bool checkIfEx(uint8 x, uint8 y);
void obName(uint8 command, uint8 commandType);
bool checkIfSet(uint8 x, uint8 y);
void readSetData();
void look();
void useKey();
void inventory();
void zoomOnOff();
void initialInv();
void allPointer();
void madmanRun();
void showGun();
void triggerMessage(uint16 index);
void processTrigger();
void identifyOb();
void signOn();
void searchForFiles(uint16 segment);

// from talk.cpp
void talk();
Expand Down
12 changes: 4 additions & 8 deletions engines/dreamweb/monitor.cpp
View file
Expand Up @@ -233,7 +233,7 @@ void DreamBase::input() {
}

void DreamGenContext::makeCaps() {
al = makeCaps(al);
al = DreamBase::makeCaps(al);
}

byte DreamBase::makeCaps(byte c) {
Expand Down Expand Up @@ -312,10 +312,6 @@ void DreamBase::accessLightOff() {
multiDump(74, 182, 12, 8);
}

void DreamGenContext::randomAccess() {
randomAccess(cx);
}

void DreamBase::randomAccess(uint16 count) {
for (uint16 i = 0; i < count; ++i) {
vSync();
Expand All @@ -330,7 +326,7 @@ void DreamBase::randomAccess(uint16 count) {
}

void DreamGenContext::monMessage() {
monMessage(al);
DreamBase::monMessage(al);
}

void DreamBase::monMessage(uint8 index) {
Expand Down Expand Up @@ -551,7 +547,7 @@ void DreamGenContext::read() {
}
}

void DreamGenContext::signOn() {
void DreamBase::signOn() {
const char *name = parser();

int8 foundIndex = -1;
Expand Down Expand Up @@ -609,7 +605,7 @@ void DreamGenContext::signOn() {
}
}

void DreamGenContext::searchForFiles(uint16 segment) {
void DreamBase::searchForFiles(uint16 segment) {
const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
byte curChar;

Expand Down
10 changes: 3 additions & 7 deletions engines/dreamweb/object.cpp
View file
Expand Up @@ -78,10 +78,6 @@ void DreamBase::makeWorn(DynObject *object) {
object->id[1] = 'E'-'A';
}

void DreamGenContext::obToInv() {
obToInv(al, ah, di, bx);
}

void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
if (index == 0xff)
Expand Down Expand Up @@ -120,7 +116,7 @@ void DreamBase::obIcons() {
showFrame(engine->icons2(), 260, 1, 1, 0);
}

void DreamGenContext::examineOb(bool examineAgain) {
void DreamBase::examineOb(bool examineAgain) {
data.byte(kPointermode) = 0;
data.word(kTimecount) = 0;

Expand Down Expand Up @@ -217,7 +213,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
data.byte(kOpenedob) = 255;
}

void DreamGenContext::inventory() {
void DreamBase::inventory() {
if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
blank();
return;
Expand Down Expand Up @@ -312,7 +308,7 @@ void DreamBase::openOb() {
_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
}

void DreamGenContext::identifyOb() {
void DreamBase::identifyOb() {
if (data.word(kWatchingtime) != 0) {
blank();
return;
Expand Down
11 changes: 1 addition & 10 deletions engines/dreamweb/print.cpp
View file
Expand Up @@ -120,15 +120,6 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
} while (true);
}

void DreamGenContext::printDirect() {
uint16 y = bx;
const uint8 *initialString = es.ptr(si, 0);
const uint8 *string = initialString;
al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
si += (string - initialString);
bx = y;
}

uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
return printDirect(&string, x, &y, maxWidth, centered);
}
Expand Down Expand Up @@ -216,7 +207,7 @@ uint16 DreamBase::waitFrames() {
void DreamGenContext::monPrint() {
uint16 originalBx = bx;
const char *string = (const char *)es.ptr(bx, 0);
const char *nextString = monPrint(string);
const char *nextString = DreamBase::monPrint(string);
bx = originalBx + (nextString - string);
}

Expand Down
54 changes: 27 additions & 27 deletions engines/dreamweb/stubs.cpp
View file
Expand Up @@ -651,7 +651,7 @@ bool DreamBase::quitRequested() {
return data.byte(kQuitrequested);
}

void DreamGenContext::screenUpdate() {
void DreamBase::screenUpdate() {
newPlace();
mainScreen();
if (quitRequested())
Expand Down Expand Up @@ -722,7 +722,7 @@ void DreamBase::startup() {
atmospheres();
}

void DreamGenContext::startup1() {
void DreamBase::startup1() {
clearPalette();
data.byte(kThroughdoor) = 0;

Expand Down Expand Up @@ -789,15 +789,15 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
}
}

void DreamGenContext::seeCommandTail() {
void DreamBase::seeCommandTail() {
data.byte(kBrightness) = 1;
}

void DreamGenContext::quickQuit() {
void DreamBase::quickQuit() {
engine->quit();
}

void DreamGenContext::quickQuit2() {
void DreamBase::quickQuit2() {
engine->quit();
}

Expand Down Expand Up @@ -842,7 +842,7 @@ void DreamBase::putUnderTimed() {
multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
}

void DreamGenContext::triggerMessage(uint16 index) {
void DreamBase::triggerMessage(uint16 index) {
multiGet(mapStore(), 174, 153, 200, 63);
uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
Expand All @@ -856,7 +856,7 @@ void DreamGenContext::triggerMessage(uint16 index) {
data.byte(kLasttrigger) = 0;
}

void DreamGenContext::processTrigger() {
void DreamBase::processTrigger() {
if (data.byte(kLasttrigger) == '1') {
setLocation(8);
triggerMessage(45);
Expand Down Expand Up @@ -1145,7 +1145,7 @@ void DreamBase::commandOnly(uint8 command) {
data.byte(kNewtextline) = 1;
}

bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
Common::List<People>::iterator i;
for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
People &people = *i;
Expand All @@ -1172,7 +1172,7 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
return false;
}

bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
bool DreamBase::checkIfFree(uint8 x, uint8 y) {
Common::List<ObjPos>::const_iterator i;
for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
const ObjPos &pos = *i;
Expand All @@ -1185,7 +1185,7 @@ bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
return false;
}

bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
bool DreamBase::checkIfEx(uint8 x, uint8 y) {
Common::List<ObjPos>::const_iterator i;
for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
const ObjPos &pos = *i;
Expand Down Expand Up @@ -1393,7 +1393,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
data.byte(kLastflag) = *flag;
}

void DreamGenContext::walkAndExamine() {
void DreamBase::walkAndExamine() {
if (!finishedWalking())
return;
data.byte(kCommandtype) = data.byte(kWalkexamtype);
Expand All @@ -1403,7 +1403,7 @@ void DreamGenContext::walkAndExamine() {
examineOb();
}

void DreamGenContext::obName(uint8 command, uint8 commandType) {
void DreamBase::obName(uint8 command, uint8 commandType) {
if (data.byte(kReasseschanges) == 0) {
if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
if (data.byte(kWalkandexam) == 1) {
Expand Down Expand Up @@ -1723,7 +1723,7 @@ void DreamBase::showIcon() {
}
}

bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
bool DreamBase::checkIfSet(uint8 x, uint8 y) {
Common::List<ObjPos>::const_iterator i;
for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
const ObjPos &pos = *i;
Expand Down Expand Up @@ -1862,7 +1862,7 @@ void DreamBase::enterSymbol() {
}
}

void DreamGenContext::zoomOnOff() {
void DreamBase::zoomOnOff() {
if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
blank();
return;
Expand Down Expand Up @@ -1900,7 +1900,7 @@ void DreamBase::sortOutMap() {
}
}

void DreamGenContext::mainScreen() {
void DreamBase::mainScreen() {
data.byte(kInmaparea) = 0;
if (data.byte(kWatchon) == 1) {
RectWithCallback<DreamGenContext> mainList[] = {
Expand Down Expand Up @@ -1937,7 +1937,7 @@ void DreamBase::showWatch() {
}
}

void DreamGenContext::dumpWatch() {
void DreamBase::dumpWatch() {
if (data.byte(kWatchdump) != 1)
return;
multiDump(256, 21, 40, 12);
Expand Down Expand Up @@ -1965,7 +1965,7 @@ void DreamBase::showTime() {
showFrame(charset, 267+5, 21, 91*3+20, 0);
}

void DreamGenContext::watchCount() {
void DreamBase::watchCount() {
if (data.byte(kWatchon) == 0)
return;
++data.byte(kTimercount);
Expand Down Expand Up @@ -2031,7 +2031,7 @@ void DreamBase::loadRoom() {
getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
}

void DreamGenContext::readSetData() {
void DreamBase::readSetData() {
data.word(kCharset1) = standardLoad("DREAMWEB.C00");

void *icons1Buffer = standardLoadCPP("DREAMWEB.G00");
Expand Down Expand Up @@ -2070,7 +2070,7 @@ void DreamBase::findRoomInLoc() {
data.byte(kRoomnum) = roomNum;
}

void DreamGenContext::autoLook() {
void DreamBase::autoLook() {
if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
data.word(kLookcounter) = 1000;
return;
Expand All @@ -2084,7 +2084,7 @@ void DreamGenContext::autoLook() {
doLook();
}

void DreamGenContext::look() {
void DreamBase::look() {
if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
blank();
return;
Expand All @@ -2097,7 +2097,7 @@ void DreamGenContext::look() {
doLook();
}

void DreamGenContext::doLook() {
void DreamBase::doLook() {
createPanel();
showIcon();
underTextLine();
Expand Down Expand Up @@ -2721,7 +2721,7 @@ void DreamBase::pickupOb(uint8 command, uint8 pos) {
transferToEx(command);
}

void DreamGenContext::initialInv() {
void DreamBase::initialInv() {
if (data.byte(kReallocation) != 24)
return;

Expand All @@ -2741,7 +2741,7 @@ void DreamGenContext::initialInv() {
switchRyanOff();
}

void DreamGenContext::walkIntoRoom() {
void DreamBase::walkIntoRoom() {
if (data.byte(kLocation) == 14 && data.byte(kMapx) == 22) {
data.byte(kDestination) = 1;
data.byte(kFinaldest) = 1;
Expand Down Expand Up @@ -2785,7 +2785,7 @@ void DreamBase::blank() {
}
}

void DreamGenContext::allPointer() {
void DreamBase::allPointer() {
readMouse();
showPointer();
dumpPointer();
Expand Down Expand Up @@ -3050,7 +3050,7 @@ void DreamBase::watchReel() {
plotReel(reelPointer);
}

void DreamGenContext::afterNewRoom() {
void DreamBase::afterNewRoom() {
if (data.byte(kNowinnewroom) == 0)
return; // notnew

Expand Down Expand Up @@ -3081,7 +3081,7 @@ void DreamGenContext::afterNewRoom() {
atmospheres();
}

void DreamGenContext::madmanRun() {
void DreamBase::madmanRun() {
if (data.byte(kLocation) != 14 ||
data.byte(kMapx) != 22 ||
data.byte(kPointermode) != 2 ||
Expand Down Expand Up @@ -3147,7 +3147,7 @@ void DreamBase::decide() {
data.byte(kTextlen) = 240;
}

void DreamGenContext::showGun() {
void DreamBase::showGun() {
data.byte(kAddtored) = 0;
data.byte(kAddtogreen) = 0;
data.byte(kAddtoblue) = 0;
Expand Down

0 comments on commit 4c66f74

Please sign in to comment.