diff options
author | Willem Jan Palenstijn | 2011-12-03 15:05:57 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-03 15:05:57 +0100 |
commit | ebeab9f4425448446af771943c94c24a7c6cf42d (patch) | |
tree | eabdc5e243eeb00588087a91590d18f38ccbfb10 /engines/dreamweb | |
parent | d37a4ee95e3ff5beddfda4b60ad93259491b8e4c (diff) | |
download | scummvm-rg350-ebeab9f4425448446af771943c94c24a7c6cf42d.tar.gz scummvm-rg350-ebeab9f4425448446af771943c94c24a7c6cf42d.tar.bz2 scummvm-rg350-ebeab9f4425448446af771943c94c24a7c6cf42d.zip |
DREAMWEB: Move 'scanForNames' out of dreamgen
Diffstat (limited to 'engines/dreamweb')
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 50 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
-rw-r--r-- | engines/dreamweb/saveload.cpp | 50 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 1 |
4 files changed, 53 insertions, 53 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 8ade7511d4..1c5e98b607 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -10217,56 +10217,6 @@ afterprintname: goto shownameloop; } -void DreamGenContext::scanForNames() { - STACK_CHECK; - dx = data; - es = dx; - di = 8579; - dx = data; - ds = dx; - dx = 8698; - cx = 7; -scanloop: - push(es); - push(ds); - push(di); - push(dx); - push(cx); - openFileFromC(); - if (flags.c()) - goto notexist; - cx = pop(); - _inc(ch); - push(cx); - push(di); - push(es); - dx = data; - ds = dx; - dx = 6091; - cx = (6187-6091); - saveFileRead(); - dx = data; - es = dx; - di = 6141; - ds = pop(); - dx = pop(); - loadSeg(); - bx = data.word(kHandle); - closeFile(); -notexist: - cx = pop(); - dx = pop(); - di = pop(); - ds = pop(); - es = pop(); - _add(dx, 13); - _add(di, 17); - _dec(cl); - if (!flags.z()) - goto scanloop; - al = ch; -} - void DreamGenContext::decide() { STACK_CHECK; setMode(); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index aaff3fe297..06835c4737 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -881,7 +881,7 @@ public: void useWindow(); void wearShades(); void delEverything(); - void fadeScreenDown(); + void clearReels(); void poolGuard(); void openInv(); void lookAtPlace(); @@ -1032,7 +1032,7 @@ public: void updateSymbolTop(); void allPointer(); void checkSoundInt(); - void clearReels(); + void fadeScreenDown(); void maleFan(); void doSaveLoad(); void createName(); @@ -1045,7 +1045,6 @@ public: void fadeScreenDowns(); void openHotelDoor2(); void getRidOfTempsP(); - void scanForNames(); void selectLocation(); void underTextLine(); void sitDownInBar(); diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index 5cff4533d6..b74fd68d0c 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -368,5 +368,55 @@ void DreamGenContext::loadPosition(unsigned int slot) { closeFile(); } +void DreamGenContext::scanForNames() { + STACK_CHECK; + dx = data; + es = dx; + di = 8579; + dx = data; + ds = dx; + dx = 8698; + cx = 7; +scanloop: + push(es); + push(ds); + push(di); + push(dx); + push(cx); + openFileFromC(); + if (flags.c()) + goto notexist; + cx = pop(); + _inc(ch); + push(cx); + push(di); + push(es); + dx = data; + ds = dx; + dx = 6091; + cx = (6187-6091); + saveFileRead(); + dx = data; + es = dx; + di = 6141; + ds = pop(); + dx = pop(); + loadSeg(); + bx = data.word(kHandle); + closeFile(); +notexist: + cx = pop(); + dx = pop(); + di = pop(); + ds = pop(); + es = pop(); + _add(dx, 13); + _add(di, 17); + _dec(cl); + if (!flags.z()) + goto scanloop; + al = ch; +} + } /*namespace dreamgen */ diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 3059bc820d..ea990d69a7 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -403,4 +403,5 @@ bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3); void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3); void enterCode(); + void scanForNames(); |