DREAMWEB: Remove more unnecessary globals

4 files changed, 257 insertions, 293 deletions

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index c4c30548d0..9d13eef210 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -89,41 +89,34 @@ uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamBase::getMapAd(const uint8 *setData) {
+uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	uint8 xad, yad;
 	if (getXAd(setData, &xad) == 0)
 		return 0;
-	data.word(kObjectx) = xad;
+	*x = xad;
 	if (getYAd(setData, &yad) == 0)
 		return 0;
-	data.word(kObjecty) = yad;
+	*y = yad;
 	return 1;
 }
 
-void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height) {
+void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
 	const Frame *frame = (const Frame *)getSegment(frameSeg).ptr(frameNum * sizeof(Frame), sizeof(Frame));
-	data.word(kSavesource) = framesAd + frame->ptr();
-	data.byte(kSavesize+0) = frame->width;
-	data.byte(kSavesize+1) = frame->height;
-	data.word(kOffsetx) = frame->x;
-	data.word(kOffsety) = frame->y;
 	*width = frame->width;
 	*height = frame->height;
-}
 
-void DreamBase::finalFrame(uint16 *x, uint16 *y) {
-	data.byte(kSavex) = (data.word(kObjectx) + data.word(kOffsetx)) & 0xff;
-	data.byte(kSavey) = (data.word(kObjecty) + data.word(kOffsety)) & 0xff;
-	*x = data.word(kObjectx);
-	*y = data.word(kObjecty);
+	objPos->xMin = (x + frame->x) & 0xff;
+	objPos->yMin = (y + frame->y) & 0xff;
+	objPos->xMax = objPos->xMin + frame->width;
+	objPos->yMax = objPos->yMin + frame->height;
 }
 
-void DreamBase::makeBackOb(SetObject *objData) {
+void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	if (data.byte(kNewobs) == 0)
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
+	Sprite *sprite = makeSprite(x, y, addr_backobject, data.word(kSetframes), 0);
 
 	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
 	assert(objDataOffset % sizeof(SetObject) == 0);
@@ -148,27 +141,22 @@ void DreamBase::showAllObs() {
 	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
 	for (size_t i = 0; i < count; ++i) {
 		SetObject *setEntry = setEntries + i;
-		if (getMapAd(setEntry->mapad) == 0)
+		uint16 x, y;
+		if (getMapAd(setEntry->mapad, &x, &y) == 0)
 			continue;
 		uint8 currentFrame = setEntry->frames[0];
 		if (currentFrame == 0xff)
 			continue;
 		uint8 width, height;
-		calcFrFrame(data.word(kSetframes), currentFrame, kFrames, &width, &height);
-		uint16 x, y;
-		finalFrame(&x, &y);
+		calcFrFrame(data.word(kSetframes), currentFrame, &width, &height, x, y, objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
 			y += data.word(kMapady);
 			showFrame(frameBase, x, y, currentFrame, 0);
 		} else
-			makeBackOb(setEntry);
+			makeBackOb(setEntry, x, y);
 
-		objPos->xMin = data.byte(kSavex);
-		objPos->yMin = data.byte(kSavey);
-		objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
-		objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 		objPos->index = i;
 		++objPos;
 	}
@@ -236,22 +224,17 @@ void DreamBase::showAllFree() {
 	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	const Frame *frameBase = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
 	for (size_t i = 0; i < count; ++i) {
-		uint8 mapAd = getMapAd(freeObjects[i].mapad);
+		uint16 x, y;
+		uint8 mapAd = getMapAd(freeObjects[i].mapad, &x, &y);
 		if (mapAd != 0) {
 			uint8 width, height;
 			uint16 currentFrame = 3 * i;
-			calcFrFrame(data.word(kFreeframes), currentFrame, kFrframes, &width, &height);
-			uint16 x, y;
-			finalFrame(&x, &y);
+			calcFrFrame(data.word(kFreeframes), currentFrame, &width, &height, x, y, objPos);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
 				assert(currentFrame < 256);
 				showFrame(frameBase, x, y, currentFrame, 0);
-				objPos->xMin = data.byte(kSavex);
-				objPos->yMin = data.byte(kSavey);
-				objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
-				objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 				objPos->index = i;
 				++objPos;
 			}
@@ -289,20 +272,15 @@ void DreamBase::showAllEx() {
 			continue;
 		if (object->currentLocation != data.byte(kReallocation))
 			continue;
-		if (getMapAd(object->mapad) == 0)
+		uint16 x, y;
+		if (getMapAd(object->mapad, &x, &y) == 0)
 			continue;
 		uint8 width, height;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(data.word(kExtras), currentFrame, kExframes, &width, &height);
-		uint16 x, y;
-		finalFrame(&x, &y);
+		calcFrFrame(data.word(kExtras), currentFrame, &width, &height, x, y, objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
-			objPos->xMin = data.byte(kSavex);
-			objPos->yMin = data.byte(kSavey);
-			objPos->xMax = data.byte(kSavesize + 0) + data.byte(kSavex);
-			objPos->yMax = data.byte(kSavesize + 1) + data.byte(kSavey);
 			objPos->index = i;
 			++objPos;
 		}
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 37c3be17d0..b49787e3b2 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -77,10 +77,9 @@ public:
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
 	uint8 getYAd(const uint8 *setData, uint8 *result);
-	uint8 getMapAd(const uint8 *setData);
-	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height);
-	void finalFrame(uint16 *x, uint16 *y);
-	void makeBackOb(SetObject *objData);
+	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
+	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
+	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
 	void showAllObs();
 	bool addAlong(const uint8 *mapFlags);
 	bool addLength(const uint8 *mapFlags);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c2d8530b25..6a68e7c2b9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1479,14 +1479,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 555;
+	si = 537;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 571;
+	si = 553;
 	_add(si, ax);
 	ax = pop();
 }
@@ -1538,7 +1538,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 555);
+	_add(bx, 537);
 	es.byte(bx) = 0;
 }
 
@@ -1558,7 +1558,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 480;
+	di = 462;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -1603,7 +1603,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 480;
+	di = 462;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -1733,7 +1733,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 480+1;
+	di = 462+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -1815,7 +1815,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 589;
+	si = 571;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -1952,14 +1952,14 @@ void DreamGenContext::__start() {
 		//0x0080: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0090: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x00c0: .... .... ...   ...
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00c0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 
-		//0x00d0: .... .... .... .  .
+		//0x00d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -1974,37 +1974,37 @@ void DreamGenContext::__start() {
 		//0x0130: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0140: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0160: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0180: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 
 		//0x0190: .... .... .... ....
+		0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
+		//0x01a0: .... .DRE AMWE B.V9
+		0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x01b0: 9.                .
+		0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 
+		//0x01c0: "ROO T          ." 
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 
+		//0x01d0:              . ....
+		0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x01e0: $... .... .... ....
+		0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01f0: .... .... .D:. ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01a0: .... .... .... ....
-		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
-		//0x01b0: .... ...D REAM WEB.
-		0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01c0: V99.               
-		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x01d0:  ."R OOT          .
-		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 
-		//0x01e0: "               ...
-		0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x01f0: ..$. .... .... ....
-		0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 
-		//0x0200: .... .... ...D :...
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0200: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
 		//0x0210: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 
 		//0x0220: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 
+		0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0230: .... .... .... ....
-		0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0240: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0250: .... .... .... ....
@@ -2018,11 +2018,9 @@ void DreamGenContext::__start() {
 		//0x0290: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x02a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x02b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-		//0x02c0: .... .... .... ....
-		0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 92b75a287a..d7f754afe9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,8 +32,8 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x01c4;
-static const uint16 offset_rootdir = 0x01d2;
+static const uint16 offset_operand1 = 0x01b2;
+static const uint16 offset_rootdir = 0x01c0;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -156,214 +156,203 @@ static const uint16 kNewscreen = 149;
 static const uint16 kRyanx = 150;
 static const uint16 kRyany = 151;
 static const uint16 kLastflag = 152;
-static const uint16 kCurrentex = 153;
-static const uint16 kCurrentfree = 154;
-static const uint16 kFramesad = 155;
-static const uint16 kDataad = 157;
-static const uint16 kFrsegment = 159;
-static const uint16 kObjectx = 161;
-static const uint16 kObjecty = 163;
-static const uint16 kOffsetx = 165;
-static const uint16 kOffsety = 167;
-static const uint16 kSavesize = 169;
-static const uint16 kSavesource = 171;
-static const uint16 kSavex = 173;
-static const uint16 kSavey = 174;
-static const uint16 kCurrentob = 175;
-static const uint16 kPrioritydep = 176;
-static const uint16 kDestpos = 177;
-static const uint16 kReallocation = 178;
-static const uint16 kRoomnum = 179;
-static const uint16 kNowinnewroom = 180;
-static const uint16 kResetmanxy = 181;
-static const uint16 kNewlocation = 182;
-static const uint16 kAutolocation = 183;
-static const uint16 kMustload = 184;
-static const uint16 kAnswered = 185;
-static const uint16 kSaidno = 186;
-static const uint16 kDoorcheck1 = 187;
-static const uint16 kDoorcheck2 = 188;
-static const uint16 kDoorcheck3 = 189;
-static const uint16 kDoorcheck4 = 190;
-static const uint16 kMousex = 191;
-static const uint16 kMousey = 193;
-static const uint16 kMousebutton = 195;
-static const uint16 kMousebutton1 = 197;
-static const uint16 kMousebutton2 = 199;
-static const uint16 kMousebutton3 = 201;
-static const uint16 kMousebutton4 = 203;
-static const uint16 kOldbutton = 205;
-static const uint16 kOldx = 207;
-static const uint16 kOldy = 209;
-static const uint16 kLastbutton = 211;
-static const uint16 kOldpointerx = 213;
-static const uint16 kOldpointery = 215;
-static const uint16 kDelherex = 217;
-static const uint16 kDelherey = 219;
-static const uint16 kPointerxs = 221;
-static const uint16 kPointerys = 222;
-static const uint16 kDelxs = 223;
-static const uint16 kDelys = 224;
-static const uint16 kPointerframe = 225;
-static const uint16 kPointerpower = 226;
-static const uint16 kAuxpointerframe = 227;
-static const uint16 kPointermode = 228;
-static const uint16 kPointerspeed = 229;
-static const uint16 kPointercount = 230;
-static const uint16 kInmaparea = 231;
-static const uint16 kSlotdata = 232;
-static const uint16 kThisslot = 233;
-static const uint16 kSlotflags = 234;
-static const uint16 kTalkmode = 235;
-static const uint16 kTalkpos = 236;
-static const uint16 kCharacter = 237;
-static const uint16 kPersondata = 238;
-static const uint16 kTalknum = 240;
-static const uint16 kNumberinroom = 241;
-static const uint16 kCurrentcel = 242;
-static const uint16 kOldselection = 243;
-static const uint16 kStopwalking = 244;
-static const uint16 kMouseon = 245;
-static const uint16 kPlayed = 246;
-static const uint16 kTimer1 = 248;
-static const uint16 kTimer2 = 249;
-static const uint16 kTimer3 = 250;
-static const uint16 kWholetimer = 251;
-static const uint16 kTimer1to = 253;
-static const uint16 kTimer2to = 254;
-static const uint16 kTimer3to = 255;
-static const uint16 kWatchdump = 256;
-static const uint16 kLogonum = 257;
-static const uint16 kOldlogonum = 258;
-static const uint16 kNetseg = 259;
-static const uint16 kNetpoint = 261;
-static const uint16 kCursorstate = 263;
-static const uint16 kPressed = 264;
-static const uint16 kPresspointer = 265;
-static const uint16 kGraphicpress = 267;
-static const uint16 kPresscount = 268;
-static const uint16 kLightcount = 269;
-static const uint16 kFolderpage = 270;
-static const uint16 kDiarypage = 271;
-static const uint16 kMenucount = 272;
-static const uint16 kSymboltopx = 273;
-static const uint16 kSymboltopnum = 274;
-static const uint16 kSymboltopdir = 275;
-static const uint16 kSymbolbotx = 276;
-static const uint16 kSymbolbotnum = 277;
-static const uint16 kSymbolbotdir = 278;
-static const uint16 kSymboltolight = 279;
-static const uint16 kSymbol1 = 280;
-static const uint16 kSymbol2 = 281;
-static const uint16 kSymbol3 = 282;
-static const uint16 kSymbolnum = 283;
-static const uint16 kDumpx = 284;
-static const uint16 kDumpy = 286;
-static const uint16 kWalkandexam = 288;
-static const uint16 kWalkexamtype = 289;
-static const uint16 kWalkexamnum = 290;
-static const uint16 kCurslocx = 291;
-static const uint16 kCurslocy = 293;
-static const uint16 kCurpos = 295;
-static const uint16 kMonadx = 297;
-static const uint16 kMonady = 299;
-static const uint16 kMonsource = 301;
-static const uint16 kNumtodo = 303;
-static const uint16 kTimecount = 305;
-static const uint16 kCounttotimed = 307;
-static const uint16 kTimedseg = 309;
-static const uint16 kTimedoffset = 311;
-static const uint16 kTimedy = 313;
-static const uint16 kTimedx = 314;
-static const uint16 kNeedtodumptimed = 315;
-static const uint16 kLoadingorsave = 316;
-static const uint16 kCurrentslot = 317;
-static const uint16 kCursorpos = 318;
-static const uint16 kColourpos = 319;
-static const uint16 kFadedirection = 320;
-static const uint16 kNumtofade = 321;
-static const uint16 kFadecount = 322;
-static const uint16 kAddtogreen = 323;
-static const uint16 kAddtored = 324;
-static const uint16 kAddtoblue = 325;
-static const uint16 kLastsoundreel = 326;
-static const uint16 kSpeechloaded = 328;
-static const uint16 kSpeechlength = 329;
-static const uint16 kVolume = 331;
-static const uint16 kVolumeto = 332;
-static const uint16 kVolumedirection = 333;
-static const uint16 kVolumecount = 334;
-static const uint16 kWongame = 335;
-static const uint16 kLasthardkey = 336;
-static const uint16 kBufferin = 337;
-static const uint16 kBufferout = 339;
-static const uint16 kExtras = 341;
-static const uint16 kWorkspace = 343;
-static const uint16 kMapstore = 345;
-static const uint16 kCharset1 = 347;
-static const uint16 kBuffers = 349;
-static const uint16 kMainsprites = 351;
-static const uint16 kBackdrop = 353;
-static const uint16 kMapdata = 355;
-static const uint16 kSounddata = 357;
-static const uint16 kSounddata2 = 359;
-static const uint16 kRecordspace = 361;
-static const uint16 kFreedat = 363;
-static const uint16 kSetdat = 365;
-static const uint16 kReel1 = 367;
-static const uint16 kReel2 = 369;
-static const uint16 kReel3 = 371;
-static const uint16 kRoomdesc = 373;
-static const uint16 kFreedesc = 375;
-static const uint16 kSetdesc = 377;
-static const uint16 kBlockdesc = 379;
-static const uint16 kSetframes = 381;
-static const uint16 kFreeframes = 383;
-static const uint16 kPeople = 385;
-static const uint16 kReels = 387;
-static const uint16 kCommandtext = 389;
-static const uint16 kPuzzletext = 391;
-static const uint16 kTraveltext = 393;
-static const uint16 kTempgraphics = 395;
-static const uint16 kTempgraphics2 = 397;
-static const uint16 kTempgraphics3 = 399;
-static const uint16 kTempsprites = 401;
-static const uint16 kTextfile1 = 403;
-static const uint16 kTextfile2 = 405;
-static const uint16 kTextfile3 = 407;
-static const uint16 kBlinkframe = 409;
-static const uint16 kBlinkcount = 410;
-static const uint16 kReasseschanges = 411;
-static const uint16 kPointerspath = 412;
-static const uint16 kManspath = 413;
-static const uint16 kPointerfirstpath = 414;
-static const uint16 kFinaldest = 415;
-static const uint16 kDestination = 416;
-static const uint16 kLinestartx = 417;
-static const uint16 kLinestarty = 419;
-static const uint16 kLineendx = 421;
-static const uint16 kLineendy = 423;
-static const uint16 kLinepointer = 425;
-static const uint16 kLinedirection = 426;
-static const uint16 kLinelength = 427;
-static const uint16 kCh0blockstocopy = 428;
-static const uint16 kCh0playing = 430;
-static const uint16 kCh0repeat = 431;
-static const uint16 kCh1playing = 432;
-static const uint16 kCh1blockstocopy = 433;
-static const uint16 kSoundbufferwrite = 435;
-static const uint16 kCurrentsample = 437;
-static const uint16 kRoomssample = 438;
-static const uint16 kBasicsample = 439;
-static const uint16 kCurrentfile = 480;
-static const uint16 kRoomscango = 555;
-static const uint16 kRoompics = 571;
-static const uint16 kOplist = 586;
-static const uint16 kInputline = 589;
-static const uint16 kPresslist = 717;
-static const uint16 kQuitrequested = 723;
-static const uint16 kSubtitles = 724;
-static const uint16 kForeignrelease = 725;
+static const uint16 kOffsetx = 153;
+static const uint16 kOffsety = 155;
+static const uint16 kCurrentob = 157;
+static const uint16 kPrioritydep = 158;
+static const uint16 kDestpos = 159;
+static const uint16 kReallocation = 160;
+static const uint16 kRoomnum = 161;
+static const uint16 kNowinnewroom = 162;
+static const uint16 kResetmanxy = 163;
+static const uint16 kNewlocation = 164;
+static const uint16 kAutolocation = 165;
+static const uint16 kMustload = 166;
+static const uint16 kAnswered = 167;
+static const uint16 kSaidno = 168;
+static const uint16 kDoorcheck1 = 169;
+static const uint16 kDoorcheck2 = 170;
+static const uint16 kDoorcheck3 = 171;
+static const uint16 kDoorcheck4 = 172;
+static const uint16 kMousex = 173;
+static const uint16 kMousey = 175;
+static const uint16 kMousebutton = 177;
+static const uint16 kMousebutton1 = 179;
+static const uint16 kMousebutton2 = 181;
+static const uint16 kMousebutton3 = 183;
+static const uint16 kMousebutton4 = 185;
+static const uint16 kOldbutton = 187;
+static const uint16 kOldx = 189;
+static const uint16 kOldy = 191;
+static const uint16 kLastbutton = 193;
+static const uint16 kOldpointerx = 195;
+static const uint16 kOldpointery = 197;
+static const uint16 kDelherex = 199;
+static const uint16 kDelherey = 201;
+static const uint16 kPointerxs = 203;
+static const uint16 kPointerys = 204;
+static const uint16 kDelxs = 205;
+static const uint16 kDelys = 206;
+static const uint16 kPointerframe = 207;
+static const uint16 kPointerpower = 208;
+static const uint16 kAuxpointerframe = 209;
+static const uint16 kPointermode = 210;
+static const uint16 kPointerspeed = 211;
+static const uint16 kPointercount = 212;
+static const uint16 kInmaparea = 213;
+static const uint16 kSlotdata = 214;
+static const uint16 kThisslot = 215;
+static const uint16 kSlotflags = 216;
+static const uint16 kTalkmode = 217;
+static const uint16 kTalkpos = 218;
+static const uint16 kCharacter = 219;
+static const uint16 kPersondata = 220;
+static const uint16 kTalknum = 222;
+static const uint16 kNumberinroom = 223;
+static const uint16 kCurrentcel = 224;
+static const uint16 kOldselection = 225;
+static const uint16 kStopwalking = 226;
+static const uint16 kMouseon = 227;
+static const uint16 kPlayed = 228;
+static const uint16 kTimer1 = 230;
+static const uint16 kTimer2 = 231;
+static const uint16 kTimer3 = 232;
+static const uint16 kWholetimer = 233;
+static const uint16 kTimer1to = 235;
+static const uint16 kTimer2to = 236;
+static const uint16 kTimer3to = 237;
+static const uint16 kWatchdump = 238;
+static const uint16 kLogonum = 239;
+static const uint16 kOldlogonum = 240;
+static const uint16 kNetseg = 241;
+static const uint16 kNetpoint = 243;
+static const uint16 kCursorstate = 245;
+static const uint16 kPressed = 246;
+static const uint16 kPresspointer = 247;
+static const uint16 kGraphicpress = 249;
+static const uint16 kPresscount = 250;
+static const uint16 kLightcount = 251;
+static const uint16 kFolderpage = 252;
+static const uint16 kDiarypage = 253;
+static const uint16 kMenucount = 254;
+static const uint16 kSymboltopx = 255;
+static const uint16 kSymboltopnum = 256;
+static const uint16 kSymboltopdir = 257;
+static const uint16 kSymbolbotx = 258;
+static const uint16 kSymbolbotnum = 259;
+static const uint16 kSymbolbotdir = 260;
+static const uint16 kSymboltolight = 261;
+static const uint16 kSymbol1 = 262;
+static const uint16 kSymbol2 = 263;
+static const uint16 kSymbol3 = 264;
+static const uint16 kSymbolnum = 265;
+static const uint16 kDumpx = 266;
+static const uint16 kDumpy = 268;
+static const uint16 kWalkandexam = 270;
+static const uint16 kWalkexamtype = 271;
+static const uint16 kWalkexamnum = 272;
+static const uint16 kCurslocx = 273;
+static const uint16 kCurslocy = 275;
+static const uint16 kCurpos = 277;
+static const uint16 kMonadx = 279;
+static const uint16 kMonady = 281;
+static const uint16 kMonsource = 283;
+static const uint16 kNumtodo = 285;
+static const uint16 kTimecount = 287;
+static const uint16 kCounttotimed = 289;
+static const uint16 kTimedseg = 291;
+static const uint16 kTimedoffset = 293;
+static const uint16 kTimedy = 295;
+static const uint16 kTimedx = 296;
+static const uint16 kNeedtodumptimed = 297;
+static const uint16 kLoadingorsave = 298;
+static const uint16 kCurrentslot = 299;
+static const uint16 kCursorpos = 300;
+static const uint16 kColourpos = 301;
+static const uint16 kFadedirection = 302;
+static const uint16 kNumtofade = 303;
+static const uint16 kFadecount = 304;
+static const uint16 kAddtogreen = 305;
+static const uint16 kAddtored = 306;
+static const uint16 kAddtoblue = 307;
+static const uint16 kLastsoundreel = 308;
+static const uint16 kSpeechloaded = 310;
+static const uint16 kSpeechlength = 311;
+static const uint16 kVolume = 313;
+static const uint16 kVolumeto = 314;
+static const uint16 kVolumedirection = 315;
+static const uint16 kVolumecount = 316;
+static const uint16 kWongame = 317;
+static const uint16 kLasthardkey = 318;
+static const uint16 kBufferin = 319;
+static const uint16 kBufferout = 321;
+static const uint16 kExtras = 323;
+static const uint16 kWorkspace = 325;
+static const uint16 kMapstore = 327;
+static const uint16 kCharset1 = 329;
+static const uint16 kBuffers = 331;
+static const uint16 kMainsprites = 333;
+static const uint16 kBackdrop = 335;
+static const uint16 kMapdata = 337;
+static const uint16 kSounddata = 339;
+static const uint16 kSounddata2 = 341;
+static const uint16 kRecordspace = 343;
+static const uint16 kFreedat = 345;
+static const uint16 kSetdat = 347;
+static const uint16 kReel1 = 349;
+static const uint16 kReel2 = 351;
+static const uint16 kReel3 = 353;
+static const uint16 kRoomdesc = 355;
+static const uint16 kFreedesc = 357;
+static const uint16 kSetdesc = 359;
+static const uint16 kBlockdesc = 361;
+static const uint16 kSetframes = 363;
+static const uint16 kFreeframes = 365;
+static const uint16 kPeople = 367;
+static const uint16 kReels = 369;
+static const uint16 kCommandtext = 371;
+static const uint16 kPuzzletext = 373;
+static const uint16 kTraveltext = 375;
+static const uint16 kTempgraphics = 377;
+static const uint16 kTempgraphics2 = 379;
+static const uint16 kTempgraphics3 = 381;
+static const uint16 kTempsprites = 383;
+static const uint16 kTextfile1 = 385;
+static const uint16 kTextfile2 = 387;
+static const uint16 kTextfile3 = 389;
+static const uint16 kBlinkframe = 391;
+static const uint16 kBlinkcount = 392;
+static const uint16 kReasseschanges = 393;
+static const uint16 kPointerspath = 394;
+static const uint16 kManspath = 395;
+static const uint16 kPointerfirstpath = 396;
+static const uint16 kFinaldest = 397;
+static const uint16 kDestination = 398;
+static const uint16 kLinestartx = 399;
+static const uint16 kLinestarty = 401;
+static const uint16 kLineendx = 403;
+static const uint16 kLineendy = 405;
+static const uint16 kLinepointer = 407;
+static const uint16 kLinedirection = 408;
+static const uint16 kLinelength = 409;
+static const uint16 kCh0blockstocopy = 410;
+static const uint16 kCh0playing = 412;
+static const uint16 kCh0repeat = 413;
+static const uint16 kCh1playing = 414;
+static const uint16 kCh1blockstocopy = 415;
+static const uint16 kSoundbufferwrite = 417;
+static const uint16 kCurrentsample = 419;
+static const uint16 kRoomssample = 420;
+static const uint16 kBasicsample = 421;
+static const uint16 kCurrentfile = 462;
+static const uint16 kRoomscango = 537;
+static const uint16 kRoompics = 553;
+static const uint16 kOplist = 568;
+static const uint16 kInputline = 571;
+static const uint16 kPresslist = 699;
+static const uint16 kQuitrequested = 705;
+static const uint16 kSubtitles = 706;
+static const uint16 kForeignrelease = 707;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);