[Scummvm-cvs-logs] CVS: scummex image.cpp,1.20,1.21 wxwindows.cpp,1.32,1.33

[Adrien Mercier]

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

Modified Files:
	image.cpp wxwindows.cpp 
Log Message:
Fixed boxes displaying with 0 width/height, and looking in the good struct for old blocks icons.

Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/image.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- image.cpp	28 Sep 2003 09:51:07 -0000	1.20
+++ image.cpp	30 Sep 2003 08:46:12 -0000	1.21
@@ -149,7 +149,7 @@
 }
 
 void Image::drawBoxes(BlockTable *_blockTable, int id, File& _input) {
-	int nBox, RMHDindex, width, height, version = 5;
+	int nBox, RMHDindex, version = 5;
 
 	if (_blockTable[id].blockTypeID == BM || _blockTable[id].blockTypeID == BX) {
 		version = 3;
@@ -158,8 +158,8 @@
 		RMHDindex = _resource->findBlock(0, _blockTable, id, "RMHD", NULL);
 	}
 
-	width = _blockTable[RMHDindex].width;
-	height = _blockTable[RMHDindex].height;
+	_width = _blockTable[RMHDindex].width;
+	_height = _blockTable[RMHDindex].height;
 
 	if ( _resource->findBlock(0, _blockTable, id, "IMAG", NULL) != -1) {
 		version = 8;

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- wxwindows.cpp	30 Sep 2003 00:38:43 -0000	1.32
+++ wxwindows.cpp	30 Sep 2003 08:46:12 -0000	1.33
@@ -873,7 +873,11 @@
 	val2 = SpecButton2->Disconnect(ID_SpecButton2, wxEVT_COMMAND_BUTTON_CLICKED);
 
 	itemtype = item->_blockType;
-	bigIconBitmap = _bigIcon[blocksInfo[itemtype].iconid];
+	if (itemtype < 200)
+		bigIconBitmap = _bigIcon[blocksInfo[itemtype].iconid];
+	else
+		bigIconBitmap = _bigIcon[oldBlocksInfo[itemtype-200].iconid];
+
 	BigIcon->SetBitmap(bigIconBitmap);
 
 	if (blocksInfo[itemtype].html == 1) {