[Scummvm-cvs-logs] scummvm master -> 98c3f7991ebc68ba8c949893eb2a7afce4a10d4c

tramboi bertrand_augereau at yahoo.fr
Sun Nov 20 15:37:35 CET 2011


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:
98c3f7991e DREAMWEB: 'neterror' ported to C++


Commit: 98c3f7991ebc68ba8c949893eb2a7afce4a10d4c
    https://github.com/scummvm/scummvm/commit/98c3f7991ebc68ba8c949893eb2a7afce4a10d4c
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-20T08:08:41-08:00

Commit Message:
DREAMWEB: 'neterror' 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 e39ddf2..31ce367 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -251,6 +251,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'input',
 	'monprint',
 	'monmessage',
+	'neterror',
 	'randomaccess',
 	'accesslighton',
 	'accesslightoff',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 053824b..dda6367 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6282,13 +6282,6 @@ quitcom:
 	al = 1;
 }
 
-void DreamGenContext::neterror() {
-	STACK_CHECK;
-	al = 5;
-	monmessage();
-	scrollmonitor();
-}
-
 void DreamGenContext::dircom() {
 	STACK_CHECK;
 	cx = 30;
@@ -15164,7 +15157,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_makecaps: makecaps(); break;
 		case addr_delchar: delchar(); break;
 		case addr_execcommand: execcommand(); break;
-		case addr_neterror: neterror(); break;
 		case addr_dircom: dircom(); break;
 		case addr_searchforfiles: searchforfiles(); break;
 		case addr_signon: signon(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d066ef3..e4e42e2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -353,7 +353,6 @@ public:
 	static const uint16 addr_signon = 0xc53c;
 	static const uint16 addr_searchforfiles = 0xc538;
 	static const uint16 addr_dircom = 0xc534;
-	static const uint16 addr_neterror = 0xc530;
 	static const uint16 addr_execcommand = 0xc52c;
 	static const uint16 addr_delchar = 0xc528;
 	static const uint16 addr_makecaps = 0xc524;
@@ -1198,7 +1197,7 @@ public:
 	void startdmablock();
 	void useopenbox();
 	void clearbuffers();
-	void neterror();
+	//void neterror();
 	void storeit();
 	//void lockeddoorway();
 	//void isitworn();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index d48bc0a..5372981 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -242,5 +242,10 @@ void DreamGenContext::monmessage(uint8 index) {
 	monprint(string);
 }
 
+void DreamGenContext::neterror() {
+	monmessage(5);
+	scrollmonitor();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 616d487..1cfeab3 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -314,4 +314,5 @@
 	void randomaccess();
 	void monmessage(uint8 index);
 	void monmessage();
+	void neterror();
 






More information about the Scummvm-git-logs mailing list