DREAMWEB: Less register pollution

2 files changed, 8 insertions, 13 deletions

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dff3756745..27c58bcf7b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1155,12 +1155,12 @@ void DreamGenContext::mainmanCPP(Sprite *sprite) {
 			++sprite->b29;
 			if (sprite->b29 == 11)
 				sprite->b29 = 1;
-			walking();
+			walking(sprite);
 			if (data.byte(kLinepointer) != 254) {
 				if ((data.byte(kFacing) & 1) == 0)
-					walking();
+					walking(sprite);
 				else if ((sprite->b29 != 2) && (sprite->b29 != 7))
-					walking();
+					walking(sprite);
 			}
 			if (data.byte(kLinepointer) == 254) {
 				if (data.byte(kTurntoface) == data.byte(kFacing)) {
@@ -1180,9 +1180,13 @@ void DreamGenContext::mainmanCPP(Sprite *sprite) {
 	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);
@@ -1246,16 +1250,8 @@ void DreamGenContext::aboutturn(Sprite *sprite) {
 }
 
 void DreamGenContext::backobject(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);
-	//
-
 	ds = data.word(kSetdat);
 	di = READ_LE_UINT16(&sprite->obj_data);
 	ObjData *objData = (ObjData *)ds.ptr(di, 0);
@@ -1263,7 +1259,6 @@ void DreamGenContext::backobject(Sprite *sprite) {
 	if (sprite->delay != 0) {
 		--sprite->delay;
 		ds = pop();
-		es = pop();
 		return;
 	}
 
@@ -1284,7 +1279,6 @@ void DreamGenContext::backobject(Sprite *sprite) {
 		steady(sprite, objData);
 
 	ds = pop();
-	es = pop();
 }
 
 void DreamGenContext::constant(Sprite *sprite, ObjData *objData) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f173a84b83..fcf72e0727 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -71,6 +71,7 @@
 	void initman();
 	void mainmanCPP(Sprite *sprite);
 	void walking();
+	void walking(Sprite *sprite);
 	void aboutturn(Sprite *sprite);
 	void backobject(Sprite *sprite);
 	void constant(Sprite *sprite, ObjData *objData);