[Scummvm-cvs-logs] scummvm master -> b7de94dd14db4f6a02aca5fab1951e186f30e349

[bluegr]

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

Summary:
b7de94dd14 DREAMWEB: Convert 'cantdrop', 'droperror' to C++


Commit: b7de94dd14db4f6a02aca5fab1951e186f30e349
    https://github.com/scummvm/scummvm/commit/b7de94dd14db4f6a02aca5fab1951e186f30e349
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-11T10:54:00-08:00

Commit Message:
DREAMWEB: Convert 'cantdrop', 'droperror' to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 074d34e..881ee7f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -214,6 +214,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'candles',
 	'candles1',
 	'candles2',
+	'cantdrop',
 	'carparkdrip',
 	'channel0only',
 	'channel0tran',
@@ -290,6 +291,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'drawflags',
 	'drawfloor',
 	'drinker',
+	'droperror',
 	'drunk',
 	'dumpblink',
 	'dumpeverything',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b4e73a2..42660f4 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2182,44 +2182,6 @@ notinlift:
 	es.byte(bx) = al;
 }
 
-void DreamGenContext::dropError() {
-	STACK_CHECK;
-	data.byte(kCommandtype) = 255;
-	delPointer();
-	di = 76;
-	bx = 21;
-	al = 56;
-	dl = 240;
-	printMessage();
-	workToScreenM();
-	cx = 50;
-	hangOnP();
-	showPanel();
-	showMan();
-	examIcon();
-	data.byte(kCommandtype) = 255;
-	workToScreenM();
-}
-
-void DreamGenContext::cantDrop() {
-	STACK_CHECK;
-	data.byte(kCommandtype) = 255;
-	delPointer();
-	di = 76;
-	bx = 21;
-	al = 24;
-	dl = 240;
-	printMessage();
-	workToScreenM();
-	cx = 50;
-	hangOnP();
-	showPanel();
-	showMan();
-	examIcon();
-	data.byte(kCommandtype) = 255;
-	workToScreenM();
-}
-
 void DreamGenContext::removeObFromInv() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommand), 100);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 761dde8..1861732 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -574,7 +574,6 @@ public:
 	void pickupConts();
 	void nextColon();
 	void allPalette();
-	void cantDrop();
 	void findInvPos();
 	void rollEndCredits();
 	void getKeyAndLogo();
@@ -625,7 +624,6 @@ public:
 	void triggerMessage();
 	void swapWithOpen();
 	void dreamweb();
-	void dropError();
 	void checkInside();
 	void findPathOfPoint();
 	void getBack1();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a339856..2caaf6c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4176,4 +4176,30 @@ void DreamGenContext::diaryKeyN() {
 		data.byte(kDiarypage) = 0;
 }
 
+void DreamGenContext::dropError() {
+	data.byte(kCommandtype) = 255;
+	delPointer();
+	printMessage(76, 21, 56, 240, 240 & 1);
+	workToScreenM();
+	hangOnP(50);
+	showPanel();
+	showMan();
+	examIcon();
+	data.byte(kCommandtype) = 255;
+	workToScreenM();
+}
+
+void DreamGenContext::cantDrop() {
+	data.byte(kCommandtype) = 255;
+	delPointer();
+	printMessage(76, 21, 24, 240, 240 & 1);
+	workToScreenM();
+	hangOnP(50);
+	showPanel();
+	showMan();
+	examIcon();
+	data.byte(kCommandtype) = 255;
+	workToScreenM();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5225878..19ebfac 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -560,5 +560,7 @@
 	void diaryKeyP();
 	void diaryKeyN();
 	void checkInput();
+	void dropError();
+	void cantDrop();
 
 #endif