[Scummvm-cvs-logs] scummvm master -> 66ee7fba707fccf4ba3ae2b577a1dae226757744

[tramboi]

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:
b7f416b3d9 DREAMWEB: 'delChar' ported to C++
66ee7fba70 DREAMWEB: Removed a useless opcode


Commit: b7f416b3d906d017eaac869cf5bb473fec43eab7
    https://github.com/scummvm/scummvm/commit/b7f416b3d906d017eaac869cf5bb473fec43eab7
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T10:22:01-08:00

Commit Message:
DREAMWEB: 'delChar' ported to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/monitor.cpp
    engines/dreamweb/stubs.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ef7a08d..b48a053 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -189,6 +189,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'credits',
 	'crosshair',
 	'dealwithspecial',
+	'delchar',
 	'delcurs',
 	'deletetaken',
 	'delpointer',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e0e5809..d5efcf7 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5405,34 +5405,6 @@ void DreamGenContext::makeCaps() {
 	_sub(al, 32);
 }
 
-void DreamGenContext::delChar() {
-	STACK_CHECK;
-	_dec(data.word(kCurpos));
-	si = data.word(kCurpos);
-	_add(si, si);
-	es = cs;
-	_add(si, 1964);
-	es.byte(si) = 0;
-	al = es.byte(si+1);
-	ah = 0;
-	_sub(data.word(kMonadx), ax);
-	_sub(data.word(kCurslocx), ax);
-	di = data.word(kMonadx);
-	bx = data.word(kMonady);
-	ds = data.word(kMapstore);
-	ax = data.word(kCurpos);
-	_xchg(al, ah);
-	si = ax;
-	cl = 8;
-	ch = 8;
-	multiPut();
-	di = data.word(kMonadx);
-	bx = data.word(kMonady);
-	cl = al;
-	ch = 8;
-	multiDump();
-}
-
 void DreamGenContext::execCommand() {
 	STACK_CHECK;
 	es = cs;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d93136f..bd42cab 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -633,7 +633,6 @@ public:
 	void manAsleep2();
 	void moreTalk();
 	void startTalk();
-	void delChar();
 	void getAnyAd();
 	void endGame();
 	void usePipe();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index ebd160a..fff38d3 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -148,6 +148,19 @@ void DreamGenContext::input() {
 	}
 }
 
+void DreamGenContext::delChar() {
+	char *inputLine = (char *)cs.ptr(kInputline, 0);
+	--data.word(kCurpos);
+	inputLine[data.word(kCurpos) * 2] = 0;
+	uint8 width = inputLine[data.word(kCurpos) * 2 + 1];
+	data.word(kMonadx) -= width;
+	data.word(kCurslocx) -= width;
+	uint16 offset = data.word(kCurpos);
+	offset = ((offset & 0x00ff) << 8) | ((offset & 0xff00) >> 8);
+	multiPut(getSegment(data.word(kMapstore)).ptr(offset, 0), data.word(kMonadx), data.word(kMonady), 8, 8);
+	multiDump(data.word(kMonadx), data.word(kMonady), al, 8);
+}
+
 void DreamGenContext::printCurs() {
 	uint16 x = data.word(kCurslocx);
 	uint16 y = data.word(kCurslocy);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ffc0d4b..e2edd89 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -45,6 +45,7 @@
 	void saveLoad();
 	void printCurs();
 	void delCurs();
+	void delChar();
 	void hangOnCurs(uint16 frameCount);
 	void hangOnCurs();
 	void multiDump();


Commit: 66ee7fba707fccf4ba3ae2b577a1dae226757744
    https://github.com/scummvm/scummvm/commit/66ee7fba707fccf4ba3ae2b577a1dae226757744
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T10:23:10-08:00

Commit Message:
DREAMWEB: Removed a useless opcode

Changed paths:
    engines/dreamweb/people.cpp



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 04b5db1..4c7f9dd 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -356,7 +356,6 @@ void DreamGenContext::manAsleep(ReelRoutine &routine) {
 
 
 void DreamGenContext::drunk(ReelRoutine &routine) {
-	_cmp(data.byte(kGeneraldead), 0);
 	if (data.byte(kGeneraldead))
 		return;
 	routine.b7 &= 127;