[Scummvm-cvs-logs] scummvm master -> 5dd3e1f6dc0ba3b81b7c32bb0edab734925e7ca5

[wjp]

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:
5dd3e1f6dc DREAMWEB: Remove more unused data from blob


Commit: 5dd3e1f6dc0ba3b81b7c32bb0edab734925e7ca5
    https://github.com/scummvm/scummvm/commit/5dd3e1f6dc0ba3b81b7c32bb0edab734925e7ca5
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-26T17:03:17-08:00

Commit Message:
DREAMWEB: Remove more unused data from blob

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ac63e7e..f18f4af 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -55,6 +55,10 @@ p = parser(skip_binary_data = [
 	'oplist',
 	'presslist',
 	'inputline',
+	'flashmousetab',
+	'id',
+	'place',
+	'blinktab',
 	# keypad.asm
 	'keypadlist',
 	'symbollist',
@@ -85,6 +89,7 @@ p = parser(skip_binary_data = [
 	'gameerror8',
 	'error2patch',
 	'error6patch',
+	'error8patch',
 	'gameinfo',
 	'endgametext1',
 	'savefiles',
@@ -263,7 +268,7 @@ p = parser(skip_binary_data = [
 	'diarytext',
 	'title7graphics',
 	'handle',
-	# 'basicsample', # This can't be removed due to tasm-recover limitations
+	'basicsample',
 	'endtextname',
 	'gungraphic',
 	'monkface',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 28d196b..37ef12e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,17 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x0170: .... .... ...D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 
-		//0x0180: WEB. V99. .... $...
-		0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 
-		//0x0190: .... .... .... ....
-		0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01a0: .... .D:. .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 102b382..28a4018 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,10 +307,9 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kBasicsample = 379;
-static const uint16 kQuitrequested = 453;
-static const uint16 kSubtitles = 454;
-static const uint16 kForeignrelease = 455;
+static const uint16 kQuitrequested = 379;
+static const uint16 kSubtitles = 380;
+static const uint16 kForeignrelease = 381;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);