[Scummvm-cvs-logs] scummvm master -> 4cbf30a88ca3cadb6f28a525f95578146d91037a

[whoozle]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7745850808 DREAMWEB: Save registers in vsync, like in original sources
4cbf30a88c DREAMWEB: Removed workaround of invalid size of extext data


Commit: 77458508085d8a03336472dd10da895deb6b8281
    https://github.com/scummvm/scummvm/commit/77458508085d8a03336472dd10da895deb6b8281
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-06-25T10:53:35-07:00

Commit Message:
DREAMWEB: Save registers in vsync, like in original sources

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 43be091..5614aa3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -434,7 +434,23 @@ void DreamGenContext::doshake() {
 }
 
 void DreamGenContext::vsync() {
+	push(ax);
+	push(bx);
+	push(cx);
+	push(dx);
+	push(si);
+	push(di);
+	push(es);
+	push(ds);
 	engine->waitForVSync();
+	ds = pop();
+	es = pop();
+	di = pop();
+	si = pop();
+	dx = pop();
+	cx = pop();
+	bx = pop();
+	ax = pop();
 }
 
 void DreamGenContext::setmode() {


Commit: 4cbf30a88ca3cadb6f28a525f95578146d91037a
    https://github.com/scummvm/scummvm/commit/4cbf30a88ca3cadb6f28a525f95578146d91037a
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-06-25T10:53:35-07:00

Commit Message:
DREAMWEB: Removed workaround of invalid size of extext data

Changed paths:
    devtools/tasmrecover/dreamweb/object.asm
    engines/dreamweb/dreamgen.cpp



diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index bc73ef5..830c967 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -2586,10 +2586,8 @@ findlenextext:	mov	cl,[es:si]
 	sub	bx,extext
 	push	bx ax
 	sub	cx,bx
-	cmp cx, 0xffff;		BIG FIXME! Find out why this is happening
-	jz $1
 	rep	movsb
-$1:	pop	bx
+	pop	bx
 	sub	extextpos,bx
 	
 	pop	si
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2afd1bc..a183c7c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -8271,11 +8271,7 @@ findlenextext:
 	push(bx);
 	push(ax);
 	_sub(cx, bx);
-	_cmp(cx,  0xffff);
-	if (flags.z())
-		goto _tmp1;
 	_movsb(cx, true);
-_tmp1:
 	bx = pop();
 	_sub(data.word(kExtextpos), bx);
 	si = pop();