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

bluegr bluegr at gmail.com
Tue Dec 15 02:21:23 CET 2015


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:
d80c39bb29 NEVERHOOD: Update resource patches for the DR version - fixes bug #6913


Commit: d80c39bb29638bed4bff6453502878eaa5afbbf9
    https://github.com/scummvm/scummvm/commit/d80c39bb29638bed4bff6453502878eaa5afbbf9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-15T03:20:03+02:00

Commit Message:
NEVERHOOD: Update resource patches for the DR version - fixes bug #6913

Some of the resource patches needed to be modified to work with the
latest changes to the DCL decoder

Changed paths:
    engines/neverhood/resourceman.cpp



diff --git a/engines/neverhood/resourceman.cpp b/engines/neverhood/resourceman.cpp
index 2065a13..81a9d8a 100644
--- a/engines/neverhood/resourceman.cpp
+++ b/engines/neverhood/resourceman.cpp
@@ -96,24 +96,26 @@ struct EntrySizeFix {
 static const EntrySizeFix entrySizeFixes[] = {
 	//  fileHash    offset   diskSize  size  fixedSize
 	// Fixes for the Russian "Dyadyushka Risech" version
-	{ 0x041137051,   667019,  23391,  41398,  41401 },	// "Options" menu header text
+	{ 0x041137051,   667019,  23391,  41398,  29191 },	// "Options" menu header text
 	{ 0x00f960021,   402268,   1704,   4378,   1870 },	// "Save" menu
 	{ 0x01301a7ea,  1220008,   2373,   4146,   2877 },	// "Load" menu
 	{ 0x084181e81,   201409,   1622,   5058,   1833 },	// "Delete" menu
+	{ 0x0C10B2015,   690410,   5850,  11162,   7870 },	// Menu text
 	{ 0x008C0AC24,  1031009,   3030,   6498,   3646 },	// Overwrite dialog
-	{ 0x0c6604282, 12813649,  19623,  35894,  35895 },	// One of the fonts when reading Willie's notes
+	{ 0x0c6604282, 12813649,  19623,  35894,  30370 },	// One of the fonts when reading Willie's notes
 	{ 0x080283101, 13104841,   1961,   3712,   3511 },	// First message from Willie
+	{ 0x058208810, 46010519,  24852, 131874, 131776 },  // Entry to hut with musical lock (untested)
 	{ 0x000918480, 17676417,    581,    916,    706 },	// First wall in the museum
-	{ 0x00800090C, 16064875,  19555,  38518,  38526 },	// First wall in the museum
-	{ 0x058208810, 46010519,  24852, 131874, 131776 },  // Entry to hut with musical lock
+	{ 0x00800090C, 16064875,  19555,  38518,  30263 },	// First wall in the museum
 	{ 0x00008E486, 39600019,    240,    454,    271 },  // Second wall in the museum
 	{ 0x003086004, 39621755,    482,    614,    600 },  // Second wall in the museum
-	{ 0x02008048E, 39611075,   3798,  21089,  21087 },  // Next couple of walls in the museum
-	{ 0x008586283, 39587864,  12155,  29731,  29730 },  // Next couple of walls in the museum
-	{ 0x030A84C80, 39606142,   4933,  16305,  16275 },  // Next couple of walls in the museum
-	{ 0x000C9A480, 39614873,   6882,  23915,  23913 },  // Next couple of walls in the museum
-	{ 0x000098880, 39603114,   3028,  10860,  10859 },  // Next couple of walls in the museum
-	{ 0x040080183, 39600259,   2855,  13400,  13395 },  // Last buggy wall in the museum
+	{ 0x02008048E, 39611075,   3798,  21089,   6374 },  // Next walls in the museum
+	{ 0x008586283, 39587864,  12155,  29731,  20582 },  // Next walls in the museum
+	{ 0x030A84C80, 39606142,   4933,  16305,   8770 },  // Next walls in the museum
+	{ 0x000C9A480, 39614873,   6882,  23915,  11571 },  // Next walls in the museum
+	{ 0x000098880, 39603114,   3028,  10860,   4762 },  // Next walls in the museum
+	{ 0x040080183, 39600259,   2855,  13400,   4305 },  // Next walls in the museum
+	{ 0x004290188, 39580567,   7297,  27131,  12322 },  // Next walls in the museum
 
 	// Fixes for the Russian "Fargus" version
 	{ 0x041137051,   758264,  29037,  49590,  49591 },	// "Options" menu header text






More information about the Scummvm-git-logs mailing list