[Scummvm-cvs-logs] scummvm master -> 46a6b30a27106afcf9ddb66edda179c2f6546bb7

tramboi bertrand_augereau at yahoo.fr
Fri Nov 18 04:31:46 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:
46a6b30a27 DREAMWEB: Wrapped kTextunder buffer in an accessor


Commit: 46a6b30a27106afcf9ddb66edda179c2f6546bb7
    https://github.com/scummvm/scummvm/commit/46a6b30a27106afcf9ddb66edda179c2f6546bb7
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-17T21:30:12-08:00

Commit Message:
DREAMWEB: Wrapped kTextunder buffer in an accessor

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



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f8f3be9..e0075da 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -208,6 +208,10 @@ static Common::String getFilename(Context &context) {
 	return Common::String(name);
 }
 
+uint8 *DreamGenContext::textUnder() {
+	return segRef(data.word(kBuffers)).ptr(kTextunder, 0);
+}
+
 uint16 DreamGenContext::standardload(const char *fileName) {
 	engine->openFile(fileName);
 	engine->readFromFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen);
@@ -263,7 +267,7 @@ void DreamGenContext::printcurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiget(segRef(data.word(kBuffers)).ptr(kTextunder, 0), x, y, 6, height);
+	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);
@@ -280,7 +284,7 @@ void DreamGenContext::delcurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiput(segRef(data.word(kBuffers)).ptr(kTextunder, 0), x, y, width, height);
+	multiput(textUnder(), x, y, width, height);
 	multidump(x, y, width, height);
 }
 
@@ -1032,7 +1036,7 @@ void DreamGenContext::deltextline() {
 	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease) != 0)
 		y -= 3;
-	multiput(segRef(data.word(kBuffers)).ptr(kTextunder, 0), x, y, kUndertextsizex, kUndertextsizey);
+	multiput(textUnder(), x, y, kUndertextsizex, kUndertextsizey);
 }
 
 void DreamGenContext::commandonly() {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1475b71..f2f4116 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -21,6 +21,7 @@
  */
 	uint16 allocatemem(uint16 paragraphs);
 	uint8 *workspace();
+	uint8 *textUnder();
 	void allocatework();
 	void clearwork();
 	void standardload();






More information about the Scummvm-git-logs mailing list