[Scummvm-cvs-logs] scummvm master -> 7874f517f79da796e480e014d72f536d3abe2af8

[lavosspawn]

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:
7874f517f7 Fix for bug #2687: BASS: Officer blunt wrong animation


Commit: 7874f517f79da796e480e014d72f536d3abe2af8
    https://github.com/scummvm/scummvm/commit/7874f517f79da796e480e014d72f536d3abe2af8
Author: lavosspawn (robert at goeffringmann.de)
Date: 2016-07-21T16:37:29+02:00

Commit Message:
Fix for bug #2687: BASS: Officer blunt wrong animation
This is the corresponding source change to create a fixed sky.cpt binary. The binary is exactly the same as the manually patched one attached to the bug ticket.
In order to fix the bug while beint least invasive, I suggest replacing the binaries (the one from the ticket should be the new, official binary) and we will put a workaround in the code anyways to deal correctly with potentially outdated binaries floating around the web and linux distributions.

The error was initially introduced with the long term conversion of Revolution's assembly sources to C++ sources, then to textual resource data and then a precompiled binary.

Changed paths:
    devtools/skycpt/COMPACT.TXT



diff --git a/devtools/skycpt/COMPACT.TXT b/devtools/skycpt/COMPACT.TXT
index af22e12..4f8f5b9 100644
--- a/devtools/skycpt/COMPACT.TXT
+++ b/devtools/skycpt/COMPACT.TXT
@@ -2741,7 +2741,7 @@ SECTION::MAINLISTS
 		0000::NULL
 		40E6::sc38_phone_talk
 		40F4::sc32_garden_talk
-		40DF::sc31_guard_talk
+		40DF::sc31_guard_talk2
 		4145::barman_talk
 		4168::sc36_col_talk2
 		4169::sc36_gal_talk