Fix long standing regression actually caused by compiler bug. Proper

fix is required.

svn-id: r19331

1 files changed, 46 insertions, 1 deletions

diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index f1e3d24016..93401f15f5 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -605,7 +605,44 @@ void AkosRenderer::codec1_genericDecode(Codec1 &v1) {
 
 #ifdef PALMOS_68K
 const byte *bigCostumeScaleTable;
+const byte *smallCostumeScaleTableAKOS;
 #else
+// This is exact duplicate of smallCostumeScaleTable[] in costume.cpp
+// See FIXME below for explanation
+const byte smallCostumeScaleTableAKOS[256] = {
+	0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
+	0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
+	0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
+	0x15, 0xE5, 0x65, 0xA5, 0x25, 0xC5, 0x45, 0x85,
+	0x05, 0xF9, 0x79, 0xB9, 0x39, 0xD9, 0x59, 0x99,
+	0x19, 0xE9, 0x69, 0xA9, 0x29, 0xC9, 0x49, 0x89,
+	0x09, 0xF1, 0x71, 0xB1, 0x31, 0xD1, 0x51, 0x91,
+	0x11, 0xE1, 0x61, 0xA1, 0x21, 0xC1, 0x41, 0x81,
+	0x01, 0xFB, 0x7B, 0xBB, 0x3B, 0xDB, 0x5B, 0x9B,
+	0x1B, 0xEB, 0x6B, 0xAB, 0x2B, 0xCB, 0x4B, 0x8B,
+	0x0B, 0xF3, 0x73, 0xB3, 0x33, 0xD3, 0x53, 0x93,
+	0x13, 0xE3, 0x63, 0xA3, 0x23, 0xC3, 0x43, 0x83,
+	0x03, 0xF7, 0x77, 0xB7, 0x37, 0xD7, 0x57, 0x97,
+	0x17, 0xE7, 0x67, 0xA7, 0x27, 0xC7, 0x47, 0x87,
+	0x07, 0xEF, 0x6F, 0xAF, 0x2F, 0xCF, 0x4F, 0x8F,
+	0x0F, 0xDF, 0x5F, 0x9F, 0x1F, 0xBF, 0x3F, 0x7F,
+	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+	0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+	0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+	0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+	0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+	0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+	0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+	0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+	0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+	0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+	0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+	0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+	0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+	0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+	0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
+};
 const byte bigCostumeScaleTable[768] = {
 	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
 	0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
@@ -721,7 +758,13 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
 	const int scaletableSize = (_vm->_heversion >= 61) ? 128 : 384;
 
 	/* implement custom scale table */
-	v1.scaletable = (_vm->_heversion >= 61) ? smallCostumeScaleTable : bigCostumeScaleTable;
+
+	// FIXME. HACK
+	// For some illogical reason gcc 3.4.x produces wrong code if
+	// smallCostumeScaleTable from costume.cpp is used here
+	// So I had to put copy of it back here as it was before 1.227 revision
+	// of this file.
+	v1.scaletable = (_vm->_heversion >= 61) ? smallCostumeScaleTableAKOS : bigCostumeScaleTable;
 	if (_vm->VAR_CUSTOMSCALETABLE != 0xFF && _vm->res.isResourceLoaded(rtString, _vm->VAR(_vm->VAR_CUSTOMSCALETABLE))) {
 		v1.scaletable = _vm->getStringAddressVar(_vm->VAR_CUSTOMSCALETABLE);
 	}
@@ -1801,10 +1844,12 @@ void ScummEngine_v7::akos_processQueue() {
 
 _GINIT(Akos)
 _GSETPTR(Scumm::bigCostumeScaleTable, GBVARS_BIGSCALETABLE_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::smallCostumeScaleTableAKOS, GBVARS_SMALLSCALETABLEAKOS_INDEX, byte, GBVARS_SCUMM)
 _GEND
 
 _GRELEASE(Akos)
 _GRELEASEPTR(GBVARS_BIGSCALETABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_SMALLSCALETABLEAKOS_INDEX, GBVARS_SCUMM)
 _GEND
 
 #endif