diff options
author | Willem Jan Palenstijn | 2011-12-03 16:46:44 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-03 16:57:42 +0100 |
commit | 720f3587cba66c176657c7953f3df3ac07baabe7 (patch) | |
tree | c7a98747cc256becd76771988780a78637049a3c /engines/dreamweb | |
parent | 23576c8f155833614f5207b14005f9a69f1c8d4f (diff) | |
download | scummvm-rg350-720f3587cba66c176657c7953f3df3ac07baabe7.tar.gz scummvm-rg350-720f3587cba66c176657c7953f3df3ac07baabe7.tar.bz2 scummvm-rg350-720f3587cba66c176657c7953f3df3ac07baabe7.zip |
DREAMWEB: Move 'loadOld' from dreamgen
Diffstat (limited to 'engines/dreamweb')
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 26 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 6 | ||||
-rw-r--r-- | engines/dreamweb/saveload.cpp | 27 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 2 |
4 files changed, 31 insertions, 30 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 00d6b94202..6ade575c32 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -10278,32 +10278,6 @@ alreadynewgame: data.byte(kGetback) = 3; } -void DreamGenContext::loadOld() { - STACK_CHECK; - _cmp(data.byte(kCommandtype), 252); - if (flags.z()) - goto alreadyloadold; - data.byte(kCommandtype) = 252; - al = 48; - commandOnly(); -alreadyloadold: - ax = data.word(kMousebutton); - _and(ax, 1); - if (flags.z()) - return /* (noloadold) */; - ax = 0x0ffff; - doLoad(); - _cmp(data.byte(kGetback), 4); - if (flags.z()) - return /* (noloadold) */; - _cmp(data.byte(kQuitrequested), 0); - if (!flags.z()) - return /* (noloadold) */; - showDecisions(); - workToScreenM(); - data.byte(kGetback) = 0; -} - void DreamGenContext::createName() { STACK_CHECK; push(ax); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 2fd2b00370..b0cb21f231 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -707,7 +707,7 @@ public: void sLabDoorE(); void sLabDoorD(); void adjustUp(); - void sLabDoorF(); + void fadeScreenDownHalf(); void loadIntroRoom(); void mouseCall(); void train(); @@ -715,6 +715,7 @@ public: void loadCart(); void bartender(); void showDiary(); + void sLabDoorF(); void outOfOpen(); void dirCom(); void dumpKeypad(); @@ -722,7 +723,6 @@ public: void endGameSeq(); void setBotLeft(); void findFirstPath(); - void loadOld(); void useSLab(); void useAltar(); void manAsleep2(); @@ -746,7 +746,6 @@ public: void disableSoundInt(); void priestText(); void openPoolBoss(); - void fadeScreenDownHalf(); void usePlate(); void lookInInterface(); void manAsleep(); @@ -921,7 +920,6 @@ public: void showOpBox(); void clearBeforeLoad(); void bibleQuote(); - void doLoad(); void showExit(); void useTrainer(); void dumpCurrent(); diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index 6af4071248..ccf70aae6e 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -416,5 +416,32 @@ unsigned int DreamGenContext::scanForNames() { return count; } +void DreamGenContext::loadOld() { + STACK_CHECK; + _cmp(data.byte(kCommandtype), 252); + if (flags.z()) + goto alreadyloadold; + data.byte(kCommandtype) = 252; + al = 48; + commandOnly(); +alreadyloadold: + ax = data.word(kMousebutton); + _and(ax, 1); + if (flags.z()) + return /* (noloadold) */; + ax = 0x0ffff; + doLoad(); + _cmp(data.byte(kGetback), 4); + if (flags.z()) + return /* (noloadold) */; + _cmp(data.byte(kQuitrequested), 0); + if (!flags.z()) + return /* (noloadold) */; + showDecisions(); + workToScreenM(); + data.byte(kGetback) = 0; +} + + } /*namespace dreamgen */ diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 36b499ae7c..3bbe0dd02c 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -406,4 +406,6 @@ void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3); void enterCode(); unsigned int scanForNames(); + void doLoad(); + void loadOld(); |