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

bluegr md5 at scummvm.org
Mon Dec 26 21:36:11 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:
fb07400086 DREAMWEB: Remove dead code


Commit: fb074000869310cbc949deeb14d8380aa0f93e0d
    https://github.com/scummvm/scummvm/commit/fb074000869310cbc949deeb14d8380aa0f93e0d
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-26T12:35:05-08:00

Commit Message:
DREAMWEB: Remove dead code

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



diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 0191aa8..6cb2541 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -120,15 +120,6 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 	} while (true);
 }
 
-void DreamGenContext::printDirect() {
-	uint16 y = bx;
-	const uint8 *initialString = es.ptr(si, 0);
-	const uint8 *string = initialString;
-	al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
-	si += (string - initialString);
-	bx = y;
-}
-
 uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	return printDirect(&string, x, &y, maxWidth, centered);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7fa403b..3536b7d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -24,15 +24,12 @@
 
 	void screenUpdate();
 	void startup1();
-	void multiGet();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiGet(dst, x, y, width, height);
 	}
-	void multiPut();
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiPut(src, x, y, width, height);
 	}
-	void multiDump();
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiDump(x, y, width, height);
 	}
@@ -40,7 +37,6 @@
 	void readOneBlock();
 	void seeCommandTail();
 	void quickQuit2();
-	void printDirect();
 	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ecb295a..06743ed 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -27,13 +27,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::multiGet() {
-	multiGet(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -50,13 +43,6 @@ void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	}
 }
 
-void DreamGenContext::multiPut() {
-	multiPut(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -73,13 +59,6 @@ void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
-void DreamGenContext::multiDump() {
-	multiDump(di, bx, cl, ch);
-	unsigned offset = di + bx * kScreenwidth;
-	si = di = offset + ch * kScreenwidth;
-	cx = 0;
-}
-
 void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
 	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);






More information about the Scummvm-git-logs mailing list