[Scummvm-cvs-logs] scummvm master -> 9f1faeb1ab016f6bf8b033cf3cd1d2c49b4d0748

[tramboi]

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:
9f1faeb1ab DREAMWEB: 'printcurs', 'delcurs' and 'hangoncurs' moved to monitor.cpp


Commit: 9f1faeb1ab016f6bf8b033cf3cd1d2c49b4d0748
    https://github.com/scummvm/scummvm/commit/9f1faeb1ab016f6bf8b033cf3cd1d2c49b4d0748
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-17T23:27:21-08:00

Commit Message:
DREAMWEB: 'printcurs', 'delcurs' and 'hangoncurs' moved to monitor.cpp

Changed paths:
    engines/dreamweb/monitor.cpp
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5da481a..4386e1a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -158,5 +158,39 @@ void DreamGenContext::input() {
 	}
 }
 
+void DreamGenContext::printcurs() {
+	uint16 x = data.word(kCurslocx);
+	uint16 y = data.word(kCurslocy);
+	uint16 height;
+	if (data.byte(kForeignrelease)) {
+		y -= 3;
+		height = 11;
+	} else
+		height = 8;
+	multiget(textUnder(), x, y, 6, height);
+	++data.word(kMaintimer);
+	if ((data.word(kMaintimer) & 16) == 0)
+		showframe((Frame *)segRef(data.word(kTempcharset)).ptr(0, 0), x, y, '/' - 32, 0);
+	multidump(x - 6, y, 12, height);
+}
+
+void DreamGenContext::delcurs() {
+	uint16 x = data.word(kCurslocx);
+	uint16 y = data.word(kCurslocy);
+	uint16 width = 6;
+	uint16 height;
+	if (data.byte(kForeignrelease)) {
+		y -= 3;
+		height = 11;
+	} else
+		height = 8;
+	multiput(textUnder(), x, y, width, height);
+	multidump(x, y, width, height);
+}
+
+void DreamGenContext::hangoncurs() {
+	hangoncurs(cx);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2c0c8ec..0daba39 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -258,40 +258,6 @@ void DreamGenContext::loadtempcharset(const char *fileName) {
 	data.word(kTempcharset) = standardload(fileName);
 }
 
-void DreamGenContext::printcurs() {
-	uint16 x = data.word(kCurslocx);
-	uint16 y = data.word(kCurslocy);
-	uint16 height;
-	if (data.byte(kForeignrelease)) {
-		y -= 3;
-		height = 11;
-	} else
-		height = 8;
-	multiget(textUnder(), x, y, 6, height);
-	++data.word(kMaintimer);
-	if ((data.word(kMaintimer) & 16) == 0)
-		showframe((Frame *)segRef(data.word(kTempcharset)).ptr(0, 0), x, y, '/' - 32, 0);
-	multidump(x - 6, y, 12, height);
-}
-
-void DreamGenContext::delcurs() {
-	uint16 x = data.word(kCurslocx);
-	uint16 y = data.word(kCurslocy);
-	uint16 width = 6;
-	uint16 height;
-	if (data.byte(kForeignrelease)) {
-		y -= 3;
-		height = 11;
-	} else
-		height = 8;
-	multiput(textUnder(), x, y, width, height);
-	multidump(x, y, width, height);
-}
-
-void DreamGenContext::hangoncurs() {
-	hangoncurs(cx);
-}
-
 void DreamGenContext::hangoncurs(uint16 frameCount) {
 	for (uint16 i = 0; i < frameCount; ++i) {
 		printcurs();