diff options
| author | Filippos Karapetis | 2011-12-08 12:33:57 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-08 12:37:24 +0200 |
| commit | 7e4a261609a4f38053d61f9717f57f91e180d2f1 (patch) | |
| tree | 777a3cb980f9e7d2c6ba88a8fe6ed4a320014785 | |
| parent | c108b9204d5f50b060b3a19084198b8631103380 (diff) | |
| download | scummvm-rg350-7e4a261609a4f38053d61f9717f57f91e180d2f1.tar.gz scummvm-rg350-7e4a261609a4f38053d61f9717f57f91e180d2f1.tar.bz2 scummvm-rg350-7e4a261609a4f38053d61f9717f57f91e180d2f1.zip | |
DREAMWEB: Port 'showdiary' to C++
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreambase.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 16 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 5 |
5 files changed, 7 insertions, 17 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 6cdec7cc3b..a37f7a7f99 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -587,6 +587,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showbyte', 'showcity', 'showcurrentfile', + 'showdiary', 'showdiscops', 'showexit', 'showfirstuse', diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h index 3849e4692a..767229029c 100644 --- a/engines/dreamweb/dreambase.h +++ b/engines/dreamweb/dreambase.h @@ -91,6 +91,7 @@ public: void showArrows(); void showOpBox(); void middlePanel(); + void showDiary(); // from vgafades.cpp uint8 *mainPalette(); diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index fed9eef3dc..718538e415 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -5857,22 +5857,6 @@ diaryloop: workToScreenM(); } -void DreamGenContext::showDiary() { - STACK_CHECK; - al = 1; - ah = 0; - di = (68+24); - bx = (48+12)+37; - ds = data.word(kTempgraphics); - showFrame(); - al = 2; - ah = 0; - di = (68+24)+176; - bx = (48+12)+108; - ds = data.word(kTempgraphics); - showFrame(); -} - void DreamGenContext::showDiaryKeys() { STACK_CHECK; _cmp(data.byte(kPresscount), 0); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 56c7aa62d5..9d283b29e9 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -571,7 +571,6 @@ public: void fadeDownMon(); void printmessage2(); void bartender(); - void showDiary(); void outOfOpen(); void dirCom(); void endGameSeq(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index a4c02e8e5a..6ad048d0dd 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -3810,4 +3810,9 @@ void DreamBase::middlePanel() { showFrame(tempSprites, 160 + 71, 21, 47, 4); } +void DreamBase::showDiary() { + showFrame(tempGraphics(), kDiaryx, kDiaryy + 37, 1, 0); + showFrame(tempGraphics(), kDiaryx + 176, kDiaryy + 108, 2, 0); +} + } // End of namespace DreamGen |