[Scummvm-cvs-logs] CVS: scummex image.cpp,1.4,1.5 resource.cpp,1.10,1.11 resource.h,1.4,1.5 scummex.cpp,1.10,1.11 wxwindows.cpp,1.8,1.9

[Adrien Mercier]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv19134

Modified Files:
	image.cpp resource.cpp resource.h scummex.cpp wxwindows.cpp 
Log Message:
support for palettes in AHDR (SMUSH)

Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/image.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- image.cpp	19 Sep 2003 15:47:41 -0000	1.4
+++ image.cpp	21 Sep 2003 18:33:04 -0000	1.5
@@ -46,6 +46,9 @@
 
 	_input.seek(_blockTable[id].offset + 8, SEEK_SET);
 
+	if (_blockTable[id].blockTypeID == AHDR)
+		_input.seek(6, SEEK_CUR);
+
 	for (int j = 0; j < 256; j++) {
 		_rgbTable[j].red = _input.readByte();	// red
 		_rgbTable[j].green = _input.readByte(); // green

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resource.cpp	21 Sep 2003 15:04:14 -0000	1.10
+++ resource.cpp	21 Sep 2003 18:33:04 -0000	1.11
@@ -747,7 +747,7 @@
 		case FOBJ:
 			_blockTable[index].blockSize = _input.readUint32BE() + 8;
 			
-			_input.readUint16LE(); // Codec
+			_blockTable[index].variables = _input.readUint16LE(); // Codec
 			_input.readUint16BE(); // Left
 			_input.readUint16BE(); // Top
 			_blockTable[index].width = _input.readUint16LE(); // Width

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resource.h	21 Sep 2003 15:04:14 -0000	1.4
+++ resource.h	21 Sep 2003 18:33:04 -0000	1.5
@@ -166,7 +166,7 @@
 	{101, "FOBJ", "SMUSH Frame Object", 0, "", 32},
 	{102, "IACT", "iMUSE Action", 0, "", 24},
 	{103, "NPAL", "New Palette", 0, "", 34},
-	{104, "TRES", "Text Resource"},
+	{104, "TRES", "Text Resource", 0, "", 47},
 	{105, "PSAD", "", 0, "", 24},
 	{106, "SAUD", "", 0, "", 24},
 	{107, "STRK", "", 0, "", 24},

Index: scummex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scummex.cpp	21 Sep 2003 15:04:14 -0000	1.10
+++ scummex.cpp	21 Sep 2003 18:33:04 -0000	1.11
@@ -340,6 +340,7 @@
 		case APAL:
 		case 208: // PA
 		case NPAL:
+		case AHDR:
 			_gui->SetButton(_blockTable[blockid].blockTypeID);
 			break;
 
@@ -381,6 +382,7 @@
 		case FOBJ:
 			_gui->updateLabel("SpecLabel1", "Frame Width", _blockTable[blockid].width);
 			_gui->updateLabel("SpecLabel2", "Frame Height", _blockTable[blockid].height);
+			_gui->updateLabel("SpecLabel3", "Codec", _blockTable[blockid].variables);
 			break;
 	}
 }

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wxwindows.cpp	21 Sep 2003 15:22:51 -0000	1.8
+++ wxwindows.cpp	21 Sep 2003 18:33:04 -0000	1.9
@@ -354,6 +354,7 @@
 		case APAL:
 		case 208: // Palettes
 		case NPAL:
+		case AHDR:
 			SpecButton1->SetLabel("View Palette");
 			SpecButton1->Show(TRUE);
 			SpecButton1->Connect( ID_SpecButton1, wxEVT_COMMAND_BUTTON_CLICKED,