aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorBertrand Augereau2011-11-28 18:28:09 +0100
committerBertrand Augereau2011-11-28 18:34:48 +0100
commit64c0b0faa74867f33156e9c91516dc6ae68464d8 (patch)
treef7961f3590c718bad38d93fedd92fc34ff92f894 /engines
parent5b44ff36179156bafa5a1639a6f87a0568b28000 (diff)
downloadscummvm-rg350-64c0b0faa74867f33156e9c91516dc6ae68464d8.tar.gz
scummvm-rg350-64c0b0faa74867f33156e9c91516dc6ae68464d8.tar.bz2
scummvm-rg350-64c0b0faa74867f33156e9c91516dc6ae68464d8.zip
DREAMWEB: Helper to get strings from kTextfile1
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/stubs.cpp12
-rw-r--r--engines/dreamweb/stubs.h1
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e2cf11119d..f44d290378 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2354,8 +2354,7 @@ void DreamGenContext::showleftpage() {
data.word(kCharshift) = 91;
data.byte(kKerning) = 1;
uint8 pageIndex = data.byte(kFolderpage) - 2;
- uint16 offset = segRef(data.word(kTextfile1)).word(pageIndex * 4) + kTextstart;
- const uint8 *string = segRef(data.word(kTextfile1)).ptr(offset, 0);
+ const uint8 *string = getTextInFile1(pageIndex * 2);
y = 48;
for (size_t i = 0; i < 2; ++i) {
uint8 lastChar;
@@ -2388,8 +2387,7 @@ void DreamGenContext::showrightpage() {
data.word(kLinespacing) = 8;
data.byte(kKerning) = 1;
uint8 pageIndex = data.byte(kFolderpage) - 1;
- uint16 offset = segRef(data.word(kTextfile1)).word(pageIndex * 4) + kTextstart;
- const uint8 *string = segRef(data.word(kTextfile1)).ptr(offset, 0);
+ const uint8 *string = getTextInFile1(pageIndex * 2);
y = 48;
for (size_t i = 0; i < 2; ++i) {
uint8 lastChar;
@@ -2419,5 +2417,11 @@ void DreamGenContext::setlocation() {
setlocation(al);
}
+const uint8 *DreamGenContext::getTextInFile1(uint16 index) {
+ uint16 offset = segRef(data.word(kTextfile1)).word(index * 2) + kTextstart;
+ const uint8 *string = segRef(data.word(kTextfile1)).ptr(offset, 0);
+ return string;
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f1245ad04a..76964b01cd 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -362,4 +362,5 @@
void getlocation();
void setlocation(uint8 index);
void setlocation();
+ const uint8 *getTextInFile1(uint16 index);