DREAMWEB: Extraction of sprite.cpp from stubs.cpp

3 files changed, 559 insertions, 529 deletions

diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk
index 3b0c7f3325..fcda4fd6f4 100644
--- a/engines/dreamweb/module.mk
+++ b/engines/dreamweb/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	detection.o \
 	dreamweb.o \
 	dreamgen.o \
+	sprite.o \
 	stubs.o
 
 # This module can be built as a plugin
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
new file mode 100644
index 0000000000..5b0449f5b2
--- /dev/null
+++ b/engines/dreamweb/sprite.cpp
@@ -0,0 +1,558 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "dreamweb/dreamweb.h"
+#include "engines/util.h"
+#include "graphics/surface.h"
+
+namespace DreamGen {
+
+Sprite *DreamGenContext::spritetable() {
+	push(es);
+	push(bx);
+
+	es = data.word(kBuffers);
+	bx = kSpritetable;
+	Sprite *sprite = (Sprite *)es.ptr(bx, 16 * sizeof(Sprite));
+
+	bx = pop();
+	es = pop();
+
+	return sprite;
+}
+
+void DreamGenContext::printsprites() {
+	for (size_t priority = 0; priority < 7; ++priority) {
+		Sprite *sprites = spritetable();
+		for (size_t j = 0; j < 16; ++j) {
+			const Sprite &sprite = sprites[j];
+			if (READ_LE_UINT16(&sprite.updateCallback) == 0x0ffff)
+				continue;
+			if (priority != sprite.priority)
+				continue;
+			if (sprite.hidden == 1)
+				continue;
+			printasprite(&sprite);
+		}
+	}
+}
+
+void DreamGenContext::printasprite(const Sprite *sprite) {
+	push(es);
+	push(bx);
+	ds = READ_LE_UINT16(&sprite->w6);
+	ax = sprite->y;
+	if (al >= 220) {
+		bx = data.word(kMapady) - (256 - al);
+	} else {
+		bx = ax + data.word(kMapady);
+	}
+
+	ax = sprite->x;
+	if (al >= 220) {
+		di = data.word(kMapadx) - (256 - al);
+	} else {
+		di = ax + data.word(kMapadx);
+	}
+	
+	uint8 c;
+	if (sprite->b29 != 0)
+		c = 8;
+	else
+		c = 0;
+	uint8 width, height;
+	showframe(es, ds, di, bx, sprite->b15, c, &width, &height);
+	cl = width;
+	ch = height;
+
+	bx = pop();
+	es = pop();
+}
+
+void DreamGenContext::clearsprites() {
+	memset(spritetable(), 0xff, sizeof(Sprite) * 16);
+}
+
+Sprite *DreamGenContext::makesprite(uint8 x, uint8 y, uint16 updateCallback, uint16 somethingInDx, uint16 somethingInDi) {
+	Sprite *sprite = spritetable();
+	while (sprite->b15 != 0xff) { // NB: No boundchecking in the original code either
+		++sprite;
+	}
+
+	WRITE_LE_UINT16(&sprite->updateCallback, updateCallback);
+	sprite->x = x;
+	sprite->y = y;
+	WRITE_LE_UINT16(&sprite->w6, somethingInDx);
+	WRITE_LE_UINT16(&sprite->w8, somethingInDi);
+	sprite->w2 = 0xffff;
+	sprite->b15 = 0;
+	sprite->delay = 0;
+	return sprite;
+}
+
+void DreamGenContext::makesprite() { // NB: returns new sprite in es:bx 
+	Sprite *sprite = makesprite(si & 0xff, si >> 8, cx, dx, di);
+
+	// Recover es:bx from sprite
+	es = data.word(kBuffers);
+	bx = kSpritetable;
+	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
+	bx += sizeof(Sprite) * (sprite - sprites);
+	//
+}
+
+void DreamGenContext::spriteupdate() {
+	Sprite *sprites = spritetable();
+	sprites[0].hidden = data.byte(kRyanon);
+
+	Sprite *sprite = sprites;
+	for (size_t i=0; i < 16; ++i) {
+		uint16 updateCallback = READ_LE_UINT16(&sprite->updateCallback);
+		if (updateCallback != 0xffff) {
+			sprite->w24 = sprite->w2;
+			if (updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
+				mainmanCPP(sprite);
+			else {
+				assert(updateCallback == addr_backobject);
+				backobject(sprite);
+			}
+		}
+	
+		if (data.byte(kNowinnewroom) == 1)
+			break;
+		++sprite;
+	}
+}
+
+void DreamGenContext::initman() {
+	Sprite *sprite = makesprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
+	sprite->priority = 4;
+	sprite->b22 = 0;
+	sprite->b29 = 0;
+
+	// Recover es:bx from sprite
+	es = data.word(kBuffers);
+	bx = kSpritetable;
+	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
+	bx += 32 * (sprite - sprites);
+	//
+}
+
+void DreamGenContext::mainmanCPP(Sprite *sprite) {
+	push(es);
+	push(ds);
+
+	// Recover es:bx from sprite
+	es = data.word(kBuffers);
+	bx = kSpritetable;
+	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
+	bx += 32 * (sprite - sprites);
+	//
+
+	if (data.byte(kResetmanxy) == 1) {
+		data.byte(kResetmanxy) = 0;
+		sprite->x = data.byte(kRyanx);
+		sprite->y = data.byte(kRyany);
+		sprite->b29 = 0;
+	}
+	--sprite->b22;
+	if (sprite->b22 != 0xff) {
+		ds = pop();
+		es = pop();
+		return;
+	}
+	sprite->b22 = 0;
+	if (data.byte(kTurntoface) != data.byte(kFacing)) {
+		aboutturn(sprite);
+	} else {
+		if ((data.byte(kTurndirection) != 0) && (data.byte(kLinepointer) == 254)) {
+			data.byte(kReasseschanges) = 1;
+			if (data.byte(kFacing) == data.byte(kLeavedirection))
+				checkforexit();
+		}
+		data.byte(kTurndirection) = 0;
+		if (data.byte(kLinepointer) == 254) {
+			sprite->b29 = 0;
+		} else {
+			++sprite->b29;
+			if (sprite->b29 == 11)
+				sprite->b29 = 1;
+			walking(sprite);
+			if (data.byte(kLinepointer) != 254) {
+				if ((data.byte(kFacing) & 1) == 0)
+					walking(sprite);
+				else if ((sprite->b29 != 2) && (sprite->b29 != 7))
+					walking(sprite);
+			}
+			if (data.byte(kLinepointer) == 254) {
+				if (data.byte(kTurntoface) == data.byte(kFacing)) {
+					data.byte(kReasseschanges) = 1;
+					if (data.byte(kFacing) == data.byte(kLeavedirection))
+						checkforexit();
+				}
+			}
+		}
+	}
+	static const uint8 facelist[] = { 0,60,33,71,11,82,22,93 };
+	sprite->b15 = sprite->b29 + facelist[data.byte(kFacing)];
+	data.byte(kRyanx) = sprite->x;
+	data.byte(kRyany) = sprite->y;
+
+	ds = pop();
+	es = pop();
+}
+
+void DreamGenContext::walking() {
+	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
+	walking(sprite);
+}
+
+void DreamGenContext::walking(Sprite *sprite) {
+	uint8 comp;
+	if (data.byte(kLinedirection) != 0) {
+		--data.byte(kLinepointer);
+		comp = 200;
+	} else {
+		++data.byte(kLinepointer);
+		comp = data.byte(kLinelength);
+	}
+	if (data.byte(kLinepointer) < comp) {
+		sprite->x = data.byte(kLinedata + data.byte(kLinepointer) * 2 + 0);
+		sprite->y = data.byte(kLinedata + data.byte(kLinepointer) * 2 + 1);
+		return;
+	}
+
+	data.byte(kLinepointer) = 254;
+	data.byte(kManspath) = data.byte(kDestination);
+	if (data.byte(kDestination) == data.byte(kFinaldest)) {
+		facerightway();
+		return;
+	}
+	data.byte(kDestination) = data.byte(kFinaldest);
+	push(es);
+	push(bx);
+	autosetwalk();
+	bx = pop();
+	es = pop();
+}
+
+void DreamGenContext::aboutturn(Sprite *sprite) {
+	bool incdir = true;
+
+	if (data.byte(kTurndirection) == 1)
+		incdir = true;
+	else if ((int8)data.byte(kTurndirection) == -1)
+		incdir = false;
+	else {
+		if (data.byte(kFacing) < data.byte(kTurntoface)) {
+			uint8 delta = data.byte(kTurntoface) - data.byte(kFacing);
+			if (delta >= 4)
+				incdir = false;
+			else
+				incdir = true;
+		} else {
+			uint8 delta = data.byte(kFacing) - data.byte(kTurntoface);
+			if (delta >= 4)
+				incdir = true;
+			else
+				incdir = false;
+		}
+	}
+
+	if (incdir) {
+		data.byte(kTurndirection) = 1;
+		data.byte(kFacing) = (data.byte(kFacing) + 1) & 7;
+		sprite->b29 = 0;
+	} else {
+		data.byte(kTurndirection) = -1;
+		data.byte(kFacing) = (data.byte(kFacing) - 1) & 7;
+		sprite->b29 = 0;
+	}
+}
+
+void DreamGenContext::backobject(Sprite *sprite) {
+	push(ds);
+
+	ds = data.word(kSetdat);
+	di = READ_LE_UINT16(&sprite->obj_data);
+	ObjData *objData = (ObjData *)ds.ptr(di, 0);
+
+	if (sprite->delay != 0) {
+		--sprite->delay;
+		ds = pop();
+		return;
+	}
+
+	sprite->delay = objData->delay;
+	if (objData->type == 6)
+		widedoor(sprite, objData);
+	else if (objData->type == 5)
+		random(sprite, objData);
+	else if (objData->type == 4)
+		lockeddoorway(sprite, objData);
+	else if (objData->type == 3)
+		liftsprite(sprite, objData);
+	else if (objData->type == 2)
+		doorway(sprite, objData);
+	else if (objData->type == 1)
+		constant(sprite, objData);
+	else
+		steady(sprite, objData);
+
+	ds = pop();
+}
+
+void DreamGenContext::constant(Sprite *sprite, ObjData *objData) {
+	++sprite->frame;
+	if (objData->b18[sprite->frame] == 255) {
+		sprite->frame = 0;
+	}
+	uint8 b18 = objData->b18[sprite->frame];
+	objData->b17 = b18;
+	sprite->b15 = b18;
+}
+
+void DreamGenContext::random(Sprite *sprite, ObjData *objData) {
+	randomnum1();
+	uint16 r = ax;
+	sprite->b15 = objData->b18[r&7];
+}
+
+void DreamGenContext::doorway(Sprite *sprite, ObjData *objData) {
+	data.byte(kDoorcheck1) = -24;
+	data.byte(kDoorcheck2) = 10;
+	data.byte(kDoorcheck3) = -30;
+	data.byte(kDoorcheck4) = 10;
+	dodoor(sprite, objData);
+}
+
+void DreamGenContext::widedoor(Sprite *sprite, ObjData *objData) {
+	data.byte(kDoorcheck1) = -24;
+	data.byte(kDoorcheck2) = 24;
+	data.byte(kDoorcheck3) = -30;
+	data.byte(kDoorcheck4) = 24;
+	dodoor(sprite, objData);
+}
+
+void DreamGenContext::dodoor() {
+	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
+	ObjData *objData = (ObjData *)ds.ptr(di, 0);
+	dodoor(sprite, objData);
+}
+
+void DreamGenContext::dodoor(Sprite *sprite, ObjData *objData) {
+	uint8 ryanx = data.byte(kRyanx);
+	uint8 ryany = data.byte(kRyany);
+	int8 deltax = ryanx - sprite->x;
+	int8 deltay = ryany - sprite->y;
+	if (ryanx < sprite->x) {
+		if (deltax < (int8)data.byte(kDoorcheck1))
+			goto shutdoor;
+	} else {
+		if (deltax >= data.byte(kDoorcheck2))
+			goto shutdoor;
+	}
+	if (ryany < sprite->y) {
+		if (deltay < (int8)data.byte(kDoorcheck3))
+			goto shutdoor;
+	} else {
+		if (deltay >= data.byte(kDoorcheck4))
+			goto shutdoor;
+	}
+//opendoor:
+	if ((data.byte(kThroughdoor) == 1) && (sprite->frame == 0))
+		sprite->frame = 6;
+
+	++sprite->frame;
+	if (sprite->frame == 1) { //doorsound2
+		if (data.byte(kReallocation) == 5) //hoteldoor2
+			al = 13;
+		else
+			al = 0;
+		playchannel1();
+	}
+	if (objData->b18[sprite->frame] == 255) {
+		--sprite->frame;
+	}
+	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	data.byte(kThroughdoor) = 1;
+	return;
+shutdoor:
+	if (sprite->frame == 5) { //doorsound1;
+		if (data.byte(kReallocation) == 5) //hoteldoor1
+			al = 13;
+		else
+			al = 1;
+		playchannel1();
+	}
+	if (sprite->frame != 0) {
+		--sprite->frame;
+	}
+	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	if (sprite->frame == 5) //nearly
+		data.byte(kThroughdoor) = 0;
+}
+
+void DreamGenContext::steady(Sprite *sprite, ObjData *objData) {
+	uint8 b18 = objData->b18[0];
+	objData->b17 = b18;
+	sprite->b15 = b18;
+}
+
+void DreamGenContext::lockeddoorway() {
+	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
+	ObjData *objData = (ObjData *)ds.ptr(di, 0);
+	lockeddoorway(sprite, objData);
+}
+
+void DreamGenContext::lockeddoorway(Sprite *sprite, ObjData *objData) {
+	if (data.byte(kRyanx) < sprite->x) {
+		if (sprite->x - data.byte(kRyanx) > 24)
+			goto shutdoor2;
+	} else {
+		if (data.byte(kRyanx) - sprite->x >= 10)
+			goto shutdoor2;
+	}
+
+	if (data.byte(kRyany) < sprite->y) {
+		if (sprite->y - data.byte(kRyany) > 30)
+			goto shutdoor2;
+	} else {
+		if (data.byte(kRyany) - sprite->y >= 12)
+			goto shutdoor2;
+	}
+
+	if (data.byte(kThroughdoor) != 1) {
+		if (data.byte(kLockstatus) == 1)
+			goto shutdoor2;
+	}
+
+	if (sprite->frame == 1) {
+		al = 0;
+		playchannel1();
+	}
+
+	if (sprite->frame == 6) {
+		al = data.byte(kDoorpath);
+		push(es);
+		push(bx);
+		turnpathon();
+		bx = pop();
+		es = pop();
+	}
+
+	if ((data.byte(kThroughdoor) == 1) && (sprite->frame == 0)) {
+		sprite->frame = 6;
+	}
+
+	++sprite->frame;
+	if (objData->b18[sprite->frame] == 255) {
+		--sprite->frame;
+	}
+
+	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	if (sprite->frame == 5)
+		data.byte(kThroughdoor) = 1;
+	return;
+
+shutdoor2:
+	if (sprite->frame == 5) {
+		al = 1;
+		playchannel1();
+	}
+
+	if (sprite->frame != 0) {
+		--sprite->frame;
+	}
+
+	data.byte(kThroughdoor) = 0;
+	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+
+	if (sprite->frame == 0) {
+		al = data.byte(kDoorpath);
+		push(es);
+		push(bx);
+		turnpathoff();
+		bx = pop();
+		es = pop();
+		data.byte(kLockstatus) = 1;
+	}
+}
+
+void DreamGenContext::liftsprite() {
+	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
+	ObjData *objData = (ObjData *)ds.ptr(di, 0);
+	liftsprite(sprite, objData);
+}
+
+void DreamGenContext::liftsprite(Sprite *sprite, ObjData *objData) {
+	uint8 liftFlag = data.byte(kLiftflag);
+	if (liftFlag == 0) { //liftclosed
+		turnpathoffCPP(data.byte(kLiftpath));
+
+		if (data.byte(kCounttoopen) != 0) {
+			_dec(data.byte(kCounttoopen));
+			if (data.byte(kCounttoopen) == 0)
+				data.byte(kLiftflag) = 3;
+		}
+		sprite->frame = 0;
+		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	}
+	else if (liftFlag == 1) {  //liftopen
+		turnpathonCPP(data.byte(kLiftpath));
+
+		if (data.byte(kCounttoclose) != 0) {
+			_dec(data.byte(kCounttoclose));
+			if (data.byte(kCounttoclose) == 0)
+				data.byte(kLiftflag) = 2;
+		}
+		sprite->frame = 12;
+		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	}	
+	else if (liftFlag == 3) { //openlift
+		if (sprite->frame == 12) {
+			data.byte(kLiftflag) = 1;
+			return;
+		}
+		++sprite->frame;
+		if (sprite->frame == 1) {
+			al = 2;
+			liftnoise();
+		}
+		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	} else { //closeLift
+		assert(liftFlag == 2);
+		if (sprite->frame == 0) {
+			data.byte(kLiftflag) = 0;
+			return;
+		}
+		--sprite->frame;
+		if (sprite->frame == 11) {
+			al = 3;
+			liftnoise();
+		}
+		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
+	}
+}
+
+} /*namespace dreamgen */
+
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 27c58bcf7b..b5373649ef 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -898,20 +898,6 @@ void DreamGenContext::frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint
 	}
 }
 
-Sprite *DreamGenContext::spritetable() {
-	push(es);
-	push(bx);
-
-	es = data.word(kBuffers);
-	bx = kSpritetable;
-	Sprite *sprite = (Sprite *)es.ptr(bx, 16 * sizeof(Sprite));
-
-	bx = pop();
-	es = pop();
-
-	return sprite;
-}
-
 void DreamGenContext::showframe(uint16 dst, uint16 src, uint16 x, uint16 y, uint8 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 	es = dst;
 	ds = src;
@@ -986,54 +972,6 @@ void DreamGenContext::showframe() {
 	ch = height;
 }
 
-void DreamGenContext::printsprites() {
-	for (size_t priority = 0; priority < 7; ++priority) {
-		Sprite *sprites = spritetable();
-		for (size_t j = 0; j < 16; ++j) {
-			const Sprite &sprite = sprites[j];
-			if (READ_LE_UINT16(&sprite.updateCallback) == 0x0ffff)
-				continue;
-			if (priority != sprite.priority)
-				continue;
-			if (sprite.hidden == 1)
-				continue;
-			printasprite(&sprite);
-		}
-	}
-}
-
-void DreamGenContext::printasprite(const Sprite *sprite) {
-	push(es);
-	push(bx);
-	ds = READ_LE_UINT16(&sprite->w6);
-	ax = sprite->y;
-	if (al >= 220) {
-		bx = data.word(kMapady) - (256 - al);
-	} else {
-		bx = ax + data.word(kMapady);
-	}
-
-	ax = sprite->x;
-	if (al >= 220) {
-		di = data.word(kMapadx) - (256 - al);
-	} else {
-		di = ax + data.word(kMapadx);
-	}
-	
-	uint8 c;
-	if (sprite->b29 != 0)
-		c = 8;
-	else
-		c = 0;
-	uint8 width, height;
-	showframe(es, ds, di, bx, sprite->b15, c, &width, &height);
-	cl = width;
-	ch = height;
-
-	bx = pop();
-	es = pop();
-}
-
 void DreamGenContext::eraseoldobs() {
 	if (data.byte(kNewobs) == 0)
 		return;
@@ -1047,337 +985,6 @@ void DreamGenContext::eraseoldobs() {
 	}
 }
 
-void DreamGenContext::clearsprites() {
-	memset(spritetable(), 0xff, sizeof(Sprite) * 16);
-}
-
-Sprite *DreamGenContext::makesprite(uint8 x, uint8 y, uint16 updateCallback, uint16 somethingInDx, uint16 somethingInDi) {
-	Sprite *sprite = spritetable();
-	while (sprite->b15 != 0xff) { // NB: No boundchecking in the original code either
-		++sprite;
-	}
-
-	WRITE_LE_UINT16(&sprite->updateCallback, updateCallback);
-	sprite->x = x;
-	sprite->y = y;
-	WRITE_LE_UINT16(&sprite->w6, somethingInDx);
-	WRITE_LE_UINT16(&sprite->w8, somethingInDi);
-	sprite->w2 = 0xffff;
-	sprite->b15 = 0;
-	sprite->delay = 0;
-	return sprite;
-}
-
-void DreamGenContext::makesprite() { // NB: returns new sprite in es:bx 
-	Sprite *sprite = makesprite(si & 0xff, si >> 8, cx, dx, di);
-
-	// Recover es:bx from sprite
-	es = data.word(kBuffers);
-	bx = kSpritetable;
-	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
-	bx += sizeof(Sprite) * (sprite - sprites);
-	//
-}
-
-void DreamGenContext::spriteupdate() {
-	Sprite *sprites = spritetable();
-	sprites[0].hidden = data.byte(kRyanon);
-
-	Sprite *sprite = sprites;
-	for (size_t i=0; i < 16; ++i) {
-		uint16 updateCallback = READ_LE_UINT16(&sprite->updateCallback);
-		if (updateCallback != 0xffff) {
-			sprite->w24 = sprite->w2;
-			if (updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
-				mainmanCPP(sprite);
-			else {
-				assert(updateCallback == addr_backobject);
-				backobject(sprite);
-			}
-		}
-	
-		if (data.byte(kNowinnewroom) == 1)
-			break;
-		++sprite;
-	}
-}
-
-void DreamGenContext::initman() {
-	Sprite *sprite = makesprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
-	sprite->priority = 4;
-	sprite->b22 = 0;
-	sprite->b29 = 0;
-
-	// Recover es:bx from sprite
-	es = data.word(kBuffers);
-	bx = kSpritetable;
-	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
-	bx += 32 * (sprite - sprites);
-	//
-}
-
-void DreamGenContext::mainmanCPP(Sprite *sprite) {
-	push(es);
-	push(ds);
-
-	// Recover es:bx from sprite
-	es = data.word(kBuffers);
-	bx = kSpritetable;
-	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
-	bx += 32 * (sprite - sprites);
-	//
-
-	if (data.byte(kResetmanxy) == 1) {
-		data.byte(kResetmanxy) = 0;
-		sprite->x = data.byte(kRyanx);
-		sprite->y = data.byte(kRyany);
-		sprite->b29 = 0;
-	}
-	--sprite->b22;
-	if (sprite->b22 != 0xff) {
-		ds = pop();
-		es = pop();
-		return;
-	}
-	sprite->b22 = 0;
-	if (data.byte(kTurntoface) != data.byte(kFacing)) {
-		aboutturn(sprite);
-	} else {
-		if ((data.byte(kTurndirection) != 0) && (data.byte(kLinepointer) == 254)) {
-			data.byte(kReasseschanges) = 1;
-			if (data.byte(kFacing) == data.byte(kLeavedirection))
-				checkforexit();
-		}
-		data.byte(kTurndirection) = 0;
-		if (data.byte(kLinepointer) == 254) {
-			sprite->b29 = 0;
-		} else {
-			++sprite->b29;
-			if (sprite->b29 == 11)
-				sprite->b29 = 1;
-			walking(sprite);
-			if (data.byte(kLinepointer) != 254) {
-				if ((data.byte(kFacing) & 1) == 0)
-					walking(sprite);
-				else if ((sprite->b29 != 2) && (sprite->b29 != 7))
-					walking(sprite);
-			}
-			if (data.byte(kLinepointer) == 254) {
-				if (data.byte(kTurntoface) == data.byte(kFacing)) {
-					data.byte(kReasseschanges) = 1;
-					if (data.byte(kFacing) == data.byte(kLeavedirection))
-						checkforexit();
-				}
-			}
-		}
-	}
-	static const uint8 facelist[] = { 0,60,33,71,11,82,22,93 };
-	sprite->b15 = sprite->b29 + facelist[data.byte(kFacing)];
-	data.byte(kRyanx) = sprite->x;
-	data.byte(kRyany) = sprite->y;
-
-	ds = pop();
-	es = pop();
-}
-
-
-void DreamGenContext::walking() {
-	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
-	walking(sprite);
-}
-
-void DreamGenContext::walking(Sprite *sprite) {
-	uint8 comp;
-	if (data.byte(kLinedirection) != 0) {
-		--data.byte(kLinepointer);
-		comp = 200;
-	} else {
-		++data.byte(kLinepointer);
-		comp = data.byte(kLinelength);
-	}
-	if (data.byte(kLinepointer) < comp) {
-		sprite->x = data.byte(kLinedata + data.byte(kLinepointer) * 2 + 0);
-		sprite->y = data.byte(kLinedata + data.byte(kLinepointer) * 2 + 1);
-		return;
-	}
-
-	data.byte(kLinepointer) = 254;
-	data.byte(kManspath) = data.byte(kDestination);
-	if (data.byte(kDestination) == data.byte(kFinaldest)) {
-		facerightway();
-		return;
-	}
-	data.byte(kDestination) = data.byte(kFinaldest);
-	push(es);
-	push(bx);
-	autosetwalk();
-	bx = pop();
-	es = pop();
-}
-
-void DreamGenContext::aboutturn(Sprite *sprite) {
-	bool incdir = true;
-
-	if (data.byte(kTurndirection) == 1)
-		incdir = true;
-	else if ((int8)data.byte(kTurndirection) == -1)
-		incdir = false;
-	else {
-		if (data.byte(kFacing) < data.byte(kTurntoface)) {
-			uint8 delta = data.byte(kTurntoface) - data.byte(kFacing);
-			if (delta >= 4)
-				incdir = false;
-			else
-				incdir = true;
-		} else {
-			uint8 delta = data.byte(kFacing) - data.byte(kTurntoface);
-			if (delta >= 4)
-				incdir = true;
-			else
-				incdir = false;
-		}
-	}
-
-	if (incdir) {
-		data.byte(kTurndirection) = 1;
-		data.byte(kFacing) = (data.byte(kFacing) + 1) & 7;
-		sprite->b29 = 0;
-	} else {
-		data.byte(kTurndirection) = -1;
-		data.byte(kFacing) = (data.byte(kFacing) - 1) & 7;
-		sprite->b29 = 0;
-	}
-}
-
-void DreamGenContext::backobject(Sprite *sprite) {
-	push(ds);
-
-	ds = data.word(kSetdat);
-	di = READ_LE_UINT16(&sprite->obj_data);
-	ObjData *objData = (ObjData *)ds.ptr(di, 0);
-
-	if (sprite->delay != 0) {
-		--sprite->delay;
-		ds = pop();
-		return;
-	}
-
-	sprite->delay = objData->delay;
-	if (objData->type == 6)
-		widedoor(sprite, objData);
-	else if (objData->type == 5)
-		random(sprite, objData);
-	else if (objData->type == 4)
-		lockeddoorway(sprite, objData);
-	else if (objData->type == 3)
-		liftsprite(sprite, objData);
-	else if (objData->type == 2)
-		doorway(sprite, objData);
-	else if (objData->type == 1)
-		constant(sprite, objData);
-	else
-		steady(sprite, objData);
-
-	ds = pop();
-}
-
-void DreamGenContext::constant(Sprite *sprite, ObjData *objData) {
-	++sprite->frame;
-	if (objData->b18[sprite->frame] == 255) {
-		sprite->frame = 0;
-	}
-	uint8 b18 = objData->b18[sprite->frame];
-	objData->b17 = b18;
-	sprite->b15 = b18;
-}
-
-void DreamGenContext::random(Sprite *sprite, ObjData *objData) {
-	randomnum1();
-	uint16 r = ax;
-	sprite->b15 = objData->b18[r&7];
-}
-
-void DreamGenContext::doorway(Sprite *sprite, ObjData *objData) {
-	data.byte(kDoorcheck1) = -24;
-	data.byte(kDoorcheck2) = 10;
-	data.byte(kDoorcheck3) = -30;
-	data.byte(kDoorcheck4) = 10;
-	dodoor(sprite, objData);
-}
-
-void DreamGenContext::widedoor(Sprite *sprite, ObjData *objData) {
-	data.byte(kDoorcheck1) = -24;
-	data.byte(kDoorcheck2) = 24;
-	data.byte(kDoorcheck3) = -30;
-	data.byte(kDoorcheck4) = 24;
-	dodoor(sprite, objData);
-}
-
-void DreamGenContext::dodoor() {
-	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
-	ObjData *objData = (ObjData *)ds.ptr(di, 0);
-	dodoor(sprite, objData);
-}
-
-void DreamGenContext::dodoor(Sprite *sprite, ObjData *objData) {
-	uint8 ryanx = data.byte(kRyanx);
-	uint8 ryany = data.byte(kRyany);
-	int8 deltax = ryanx - sprite->x;
-	int8 deltay = ryany - sprite->y;
-	if (ryanx < sprite->x) {
-		if (deltax < (int8)data.byte(kDoorcheck1))
-			goto shutdoor;
-	} else {
-		if (deltax >= data.byte(kDoorcheck2))
-			goto shutdoor;
-	}
-	if (ryany < sprite->y) {
-		if (deltay < (int8)data.byte(kDoorcheck3))
-			goto shutdoor;
-	} else {
-		if (deltay >= data.byte(kDoorcheck4))
-			goto shutdoor;
-	}
-//opendoor:
-	if ((data.byte(kThroughdoor) == 1) && (sprite->frame == 0))
-		sprite->frame = 6;
-
-	++sprite->frame;
-	if (sprite->frame == 1) { //doorsound2
-		if (data.byte(kReallocation) == 5) //hoteldoor2
-			al = 13;
-		else
-			al = 0;
-		playchannel1();
-	}
-	if (objData->b18[sprite->frame] == 255) {
-		--sprite->frame;
-	}
-	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	data.byte(kThroughdoor) = 1;
-	return;
-shutdoor:
-	if (sprite->frame == 5) { //doorsound1;
-		if (data.byte(kReallocation) == 5) //hoteldoor1
-			al = 13;
-		else
-			al = 1;
-		playchannel1();
-	}
-	if (sprite->frame != 0) {
-		--sprite->frame;
-	}
-	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	if (sprite->frame == 5) //nearly
-		data.byte(kThroughdoor) = 0;
-}
-
-void DreamGenContext::steady(Sprite *sprite, ObjData *objData) {
-	uint8 b18 = objData->b18[0];
-	objData->b17 = b18;
-	sprite->b15 = b18;
-}
-
 void DreamGenContext::turnpathonCPP(uint8 param) {
 	al = param;
 	push(es);
@@ -1396,142 +1003,6 @@ void DreamGenContext::turnpathoffCPP(uint8 param) {
 	es = pop();
 }
 
-void DreamGenContext::lockeddoorway() {
-	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
-	ObjData *objData = (ObjData *)ds.ptr(di, 0);
-	lockeddoorway(sprite, objData);
-}
-
-void DreamGenContext::lockeddoorway(Sprite *sprite, ObjData *objData) {
-	if (data.byte(kRyanx) < sprite->x) {
-		if (sprite->x - data.byte(kRyanx) > 24)
-			goto shutdoor2;
-	} else {
-		if (data.byte(kRyanx) - sprite->x >= 10)
-			goto shutdoor2;
-	}
-
-	if (data.byte(kRyany) < sprite->y) {
-		if (sprite->y - data.byte(kRyany) > 30)
-			goto shutdoor2;
-	} else {
-		if (data.byte(kRyany) - sprite->y >= 12)
-			goto shutdoor2;
-	}
-
-	if (data.byte(kThroughdoor) != 1) {
-		if (data.byte(kLockstatus) == 1)
-			goto shutdoor2;
-	}
-
-	if (sprite->frame == 1) {
-		al = 0;
-		playchannel1();
-	}
-
-	if (sprite->frame == 6) {
-		al = data.byte(kDoorpath);
-		push(es);
-		push(bx);
-		turnpathon();
-		bx = pop();
-		es = pop();
-	}
-
-	if ((data.byte(kThroughdoor) == 1) && (sprite->frame == 0)) {
-		sprite->frame = 6;
-	}
-
-	++sprite->frame;
-	if (objData->b18[sprite->frame] == 255) {
-		--sprite->frame;
-	}
-
-	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	if (sprite->frame == 5)
-		data.byte(kThroughdoor) = 1;
-	return;
-
-shutdoor2:
-	if (sprite->frame == 5) {
-		al = 1;
-		playchannel1();
-	}
-
-	if (sprite->frame != 0) {
-		--sprite->frame;
-	}
-
-	data.byte(kThroughdoor) = 0;
-	sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-
-	if (sprite->frame == 0) {
-		al = data.byte(kDoorpath);
-		push(es);
-		push(bx);
-		turnpathoff();
-		bx = pop();
-		es = pop();
-		data.byte(kLockstatus) = 1;
-	}
-}
-
-void DreamGenContext::liftsprite() {
-	Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
-	ObjData *objData = (ObjData *)ds.ptr(di, 0);
-	liftsprite(sprite, objData);
-}
-
-void DreamGenContext::liftsprite(Sprite *sprite, ObjData *objData) {
-	uint8 liftFlag = data.byte(kLiftflag);
-	if (liftFlag == 0) { //liftclosed
-		turnpathoffCPP(data.byte(kLiftpath));
-
-		if (data.byte(kCounttoopen) != 0) {
-			_dec(data.byte(kCounttoopen));
-			if (data.byte(kCounttoopen) == 0)
-				data.byte(kLiftflag) = 3;
-		}
-		sprite->frame = 0;
-		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	}
-	else if (liftFlag == 1) {  //liftopen
-		turnpathonCPP(data.byte(kLiftpath));
-
-		if (data.byte(kCounttoclose) != 0) {
-			_dec(data.byte(kCounttoclose));
-			if (data.byte(kCounttoclose) == 0)
-				data.byte(kLiftflag) = 2;
-		}
-		sprite->frame = 12;
-		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	}	
-	else if (liftFlag == 3) { //openlift
-		if (sprite->frame == 12) {
-			data.byte(kLiftflag) = 1;
-			return;
-		}
-		++sprite->frame;
-		if (sprite->frame == 1) {
-			al = 2;
-			liftnoise();
-		}
-		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	} else { //closeLift
-		assert(liftFlag == 2);
-		if (sprite->frame == 0) {
-			data.byte(kLiftflag) = 0;
-			return;
-		}
-		--sprite->frame;
-		if (sprite->frame == 11) {
-			al = 3;
-			liftnoise();
-		}
-		sprite->b15 = objData->b17 = objData->b18[sprite->frame];
-	}
-}
-
 void DreamGenContext::modifychar() {
 	al = engine->modifyChar(al);
 }