aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdevtools/tasmrecover/tasm-recover1
-rw-r--r--engines/dreamweb/dreambase.h1
-rw-r--r--engines/dreamweb/dreamgen.cpp2
-rw-r--r--engines/dreamweb/dreamgen.h1
-rw-r--r--engines/dreamweb/monitor.cpp4
-rw-r--r--engines/dreamweb/newplace.cpp4
-rw-r--r--engines/dreamweb/print.cpp2
-rw-r--r--engines/dreamweb/sprite.cpp2
-rw-r--r--engines/dreamweb/stubs.cpp20
-rw-r--r--engines/dreamweb/use.cpp2
10 files changed, 20 insertions, 19 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index e14b3fe50d..a8abb4f18e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -41,6 +41,7 @@ p = parser(skip_binary_data = [
'recname',
'fileheader',
'filedata',
+ 'foreignrelease',
'extradata',
'keybuffer',
'spritename1',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 23714ad801..c9bb2dfd86 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -116,6 +116,7 @@ public:
bool _quitRequested;
bool _subtitles;
+ bool _foreignRelease;
// from backdrop.cpp
void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index eda7dce35a..331122ea05 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
//0x0150: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0160: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, };
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, };
ds.assign(src, src + sizeof(src));
dreamweb();
}
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b608cfa967..5a0100dcd9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,7 +307,6 @@ static const uint16 kCh1playing = 374;
static const uint16 kCh1blockstocopy = 375;
static const uint16 kCurrentsample = 377;
static const uint16 kRoomssample = 378;
-static const uint16 kForeignrelease = 379;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 69a46d725f..7419bcfdd8 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -256,7 +256,7 @@ void DreamBase::printCurs() {
uint16 x = data.word(kCurslocx);
uint16 y = data.word(kCurslocy);
uint16 height;
- if (data.byte(kForeignrelease)) {
+ if (_foreignRelease) {
y -= 3;
height = 11;
} else
@@ -273,7 +273,7 @@ void DreamBase::delCurs() {
uint16 y = data.word(kCurslocy);
uint16 width = 6;
uint16 height;
- if (data.byte(kForeignrelease)) {
+ if (_foreignRelease) {
y -= 3;
height = 11;
} else
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 3c50eb7b12..8c94b3f9cf 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -117,13 +117,13 @@ void DreamBase::lookAtPlace() {
getUnderCentre();
showFrame(tempGraphics3(), 60, 72, 0, 0);
showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
findNextColon(&string);
- uint16 y = (data.byte(kForeignrelease)) ? 84 + 4 : 84;
+ uint16 y = (_foreignRelease) ? 84 + 4 : 84;
printDirect(&string, 63, &y, 191, 191 & 1);
workToScreenM();
hangOnP(500);
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 7bd090d3ee..9cd7b46d50 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -66,7 +66,7 @@ void DreamBase::printChar(const Frame *charSet, uint16* x, uint16 y, uint8 c, ui
width = &dummyWidth;
if (height == NULL)
height = &dummyHeight;
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
y -= 3;
uint16 tmp = c - 32 + data.word(kCharshift);
showFrame(charSet, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index f23804b395..bc2fc60b32 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -809,7 +809,7 @@ void DreamBase::reconstruct() {
drawFloor();
spriteUpdate();
printSprites();
- if ((data.byte(kForeignrelease) != 0) && (data.byte(kReallocation) == 20))
+ if (_foreignRelease && (data.byte(kReallocation) == 20))
underTextLine();
data.byte(kHavedoneobs) = 0;
}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2b9103408a..6a7516bf82 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -461,10 +461,10 @@ void DreamBase::dreamweb() {
case Common::EN_ANY:
case Common::EN_GRB:
case Common::EN_USA:
- // Implicit data.byte(kForeignrelease) = 0
+ _foreignRelease = false;
break;
default:
- data.byte(kForeignrelease) = 1;
+ _foreignRelease = true;
break;
}
@@ -816,20 +816,20 @@ void DreamBase::dumpTextLine() {
data.byte(kNewtextline) = 0;
uint16 x = data.word(kTextaddressx);
uint16 y = data.word(kTextaddressy);
- if (data.byte(kForeignrelease) != 0)
+ if (_foreignRelease)
y -= 3;
multiDump(x, y, 228, 13);
}
void DreamBase::getUnderTimed() {
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
else
multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
}
void DreamBase::putUnderTimed() {
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
else
multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
@@ -914,7 +914,7 @@ void DreamBase::dumpTimedText() {
if (data.byte(kNeedtodumptimed) != 1)
return;
uint8 y = data.byte(kTimedy);
- if (data.byte(kForeignrelease) != 0)
+ if (_foreignRelease)
y -= 3;
multiDump(data.byte(kTimedx), y, 240, kUndertimedysize);
@@ -1122,7 +1122,7 @@ void DreamBase::crosshair() {
}
void DreamBase::delTextLine() {
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
else
multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
@@ -2821,13 +2821,13 @@ void DreamBase::obsThatDoThings() {
void DreamBase::describeOb() {
const uint8 *obText = getObTextStart();
uint16 y = 92;
- if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
+ if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
y = 82;
data.word(kCharshift) = 91 + 91;
printDirect(&obText, 33, &y, 241, 241 & 1);
data.word(kCharshift) = 0;
y = 104;
- if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
+ if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
y = 94;
printDirect(&obText, 36, &y, 241, 241 & 1);
obsThatDoThings();
@@ -2972,7 +2972,7 @@ void DreamBase::showDiary() {
}
void DreamBase::underTextLine() {
- if (data.byte(kForeignrelease))
+ if (_foreignRelease)
multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
else
multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index a7d80b8a03..280d78ba55 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1575,7 +1575,7 @@ void DreamBase::useCashCard() {
showPanel();
showExit();
showMan();
- uint16 y = (!data.byte(kForeignrelease)) ? 120 : 120 - 3;
+ uint16 y = (!_foreignRelease) ? 120 : 120 - 3;
showFrame(tempGraphics(), 114, y, 39, 0);
const uint8 *obText = getObTextStart();
findNextColon(&obText);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 09:16:58 +0000