[Scummvm-cvs-logs] scummvm master -> 1f47b877bd58043e249b61150776b7731e2aa999

[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:
1f47b877bd DREAMWEB: 'doblocks' moves to backdrops.cpp


Commit: 1f47b877bd58043e249b61150776b7731e2aa999
    https://github.com/scummvm/scummvm/commit/1f47b877bd58043e249b61150776b7731e2aa999
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-17T09:58:05-07:00

Commit Message:
DREAMWEB: 'doblocks' moves to backdrops.cpp

Changed paths:
    engines/dreamweb/backdrop.cpp
    engines/dreamweb/vgagrafx.cpp



diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 010d314..708a544 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -26,6 +26,48 @@
 
 namespace DreamGen {
 
+void DreamGenContext::doblocks() {
+	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
+	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
+	ds = data.word(kMapdata);
+	const uint8 *mapData = ds.ptr(mapOffset, 0);
+	ds = data.word(kBackdrop);
+	const uint8 *blocks = ds.ptr(kBlocks, 0);
+	es = data.word(kWorkspace);
+	uint8 *dstBuffer = es.ptr(dstOffset, 0);
+
+	for (size_t i = 0; i < 10; ++i) {
+		for (size_t j = 0; j < 11; ++j) {
+			uint16 blockType = mapData[j];
+			if (blockType != 0) {
+				uint8 *dst = dstBuffer + i * 320 * 16 + j * 16;
+				const uint8 *block = blocks + blockType * 256;
+				for (size_t k = 0; k < 4; ++k) {
+					memcpy(dst, block, 16);
+					block += 16;
+					dst += 320;
+				}
+				for (size_t k = 0; k < 12; ++k) {
+					memcpy(dst, block, 16);
+					memset(dst + 16, 0xdf, 4);
+					block += 16;
+					dst += 320;
+				}
+				dst += 4;
+				ax = 0x0dfdf;
+				memset(dst, 0xdf, 16);
+				dst += 320;
+				memset(dst, 0xdf, 16);
+				dst += 320;
+				memset(dst, 0xdf, 16);
+				dst += 320;
+				memset(dst, 0xdf, 16);
+			}
+		}
+		mapData += kMapwidth;
+	}
+}
+
 uint8 DreamGenContext::getxad(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[0];
 	uint8 v1 = setData[1];
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index c87e27a..5e0e35e 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -378,48 +378,6 @@ void DreamGenContext::clearwork() {
 	memset(workspace(), 0, 320*200);
 }
 
-void DreamGenContext::doblocks() {
-	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
-	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
-	ds = data.word(kMapdata);
-	const uint8 *mapData = ds.ptr(mapOffset, 0);
-	ds = data.word(kBackdrop);
-	const uint8 *blocks = ds.ptr(kBlocks, 0);
-	es = data.word(kWorkspace);
-	uint8 *dstBuffer = es.ptr(dstOffset, 0);
-
-	for (size_t i = 0; i < 10; ++i) {
-		for (size_t j = 0; j < 11; ++j) {
-			uint16 blockType = mapData[j];
-			if (blockType != 0) {
-				uint8 *dst = dstBuffer + i * 320 * 16 + j * 16;
-				const uint8 *block = blocks + blockType * 256;
-				for (size_t k = 0; k < 4; ++k) {
-					memcpy(dst, block, 16);
-					block += 16;
-					dst += 320;
-				}
-				for (size_t k = 0; k < 12; ++k) {
-					memcpy(dst, block, 16);
-					memset(dst + 16, 0xdf, 4);
-					block += 16;
-					dst += 320;
-				}
-				dst += 4;
-				ax = 0x0dfdf;
-				memset(dst, 0xdf, 16);
-				dst += 320;
-				memset(dst, 0xdf, 16);
-				dst += 320;
-				memset(dst, 0xdf, 16);
-				dst += 320;
-				memset(dst, 0xdf, 16);
-			}
-		}
-		mapData += kMapwidth;
-	}
-}
-
 void DreamGenContext::zoom() {
 	if (data.word(kWatchingtime) != 0)
 		return;