[Scummvm-cvs-logs] SF.net SVN: scummvm: [30525] scummvm/trunk

[dreammaster at users.sourceforge.net]

Revision: 30525
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30525&view=rev
Author:   dreammaster
Date:     2008-01-17 01:45:40 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Corrected offset for animation of player operating rack in German version, and cleaned up the talk data reader which should fix some bad talk data being generated for the German version

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/lure.dat
    scummvm/trunk/tools/create_lure/create_lure_dat.cpp
    scummvm/trunk/tools/create_lure/create_lure_dat.h

Modified: scummvm/trunk/dists/engine-data/lure.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/tools/create_lure/create_lure_dat.cpp
===================================================================
--- scummvm/trunk/tools/create_lure/create_lure_dat.cpp	2008-01-17 09:05:56 UTC (rev 30524)
+++ scummvm/trunk/tools/create_lure/create_lure_dat.cpp	2008-01-17 09:45:40 UTC (rev 30525)
@@ -103,7 +103,7 @@
 	{{0x5A62, 0x5B22, 0x5B42, 0x5b72, 0x5b42}},	// Minnow pulling lever in room #48
 	{{0x5AAA, 0x5B6A, 0x5B8A, 0x5bba, 0x5b8a}},	// Goewin mixing potion					
 	{{0x5C80, 0x5D40, 0x5D60, 0x5d90, 0x5d60}}, // Player standard animation
-	{{0x5C95, 0x5D55, 0x5D75, 0x5db5, 0x5d75}}, // Player operating rack
+	{{0x5C95, 0x5D55, 0x5D75, 0x5da5, 0x5d75}}, // Player operating rack
 	{{0x5CAA, 0x5D6A, 0x5D8A, 0x5dba, 0x5d8a}},	// Selena animation
 	{{0x5CE9, 0x5DA9, 0x5DC9, 0x5df9, 0x5dc9}},	// Blacksmith default
 	{{0x5D28, 0x5DE8, 0x5E08, 0x5e38, 0x5e08}},	// Goewin animation
@@ -1018,8 +1018,11 @@
 		sortedOffsets[entryCtr] = currVal;
 		prevVal = currVal;
 	}
-	sortedOffsets[entryCtr] = 0x5540; // end for end record
 
+	// Assume that the last talk header will have the same number of entries across language versions, 
+	// so create an end address based on the start of the last entry using start/end from English version
+	sortedOffsets[entryCtr] = sortedOffsets[entryCtr - 1] + (0x5540 - 0x5504);
+
 	data = (byte *) malloc(MAX_DATA_SIZE);
 	TalkEntry *entry = (TalkEntry *) data;
 	uint16 offset = TALK_NUM_ENTRIES * sizeof(TalkEntry) + sizeof(uint16);

Modified: scummvm/trunk/tools/create_lure/create_lure_dat.h
===================================================================
--- scummvm/trunk/tools/create_lure/create_lure_dat.h	2008-01-17 09:05:56 UTC (rev 30524)
+++ scummvm/trunk/tools/create_lure/create_lure_dat.h	2008-01-17 09:45:40 UTC (rev 30525)
@@ -30,7 +30,7 @@
 #include "common/util.h"
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 28
+#define VERSION_MINOR 29
 
 #define DIALOG_SIZE 0x150
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.