[Scummvm-cvs-logs] CVS: scummvm/saga image.cpp,1.25,1.26 interface.cpp,1.133,1.134

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577

Modified Files:
	image.cpp interface.cpp 
Log Message:
Fixe bug #1257869 "ITE: Crash when viewing the map"


Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- image.cpp	29 Jul 2005 17:57:40 -0000	1.25
+++ image.cpp	13 Aug 2005 01:05:59 -0000	1.26
@@ -58,7 +58,7 @@
 	size_t out_buf_len;
 
 	if (image_size <= SAGA_IMAGE_DATA_OFFSET) {
-		error("decodeBGImage() Image size is way too small");
+		error("decodeBGImage() Image size is way too small (%d)", image_size);
 	}
 
 	MemoryReadStreamEndian readS(image_data, image_size, isBigEndian());

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- interface.cpp	12 Aug 2005 20:06:41 -0000	1.133
+++ interface.cpp	13 Aug 2005 01:05:59 -0000	1.134
@@ -570,7 +570,7 @@
 
 	drawStatusBar();
 
-	if (_panelMode == kPanelMain) {
+	if (_panelMode == kPanelMain || _panelMode == kPanelMap) {
 		_mainPanel.getRect(rect);
 		backBuffer->blit(rect, _mainPanel.image);
 
@@ -2129,7 +2129,8 @@
 
 	rect.left = rect.top = 0;
 
-	_vm->_resource->loadResource(_interfaceContext, RID_ITE_TYCHO_MAP, resource, resourceLength);
+	_vm->_resource->loadResource(_interfaceContext, 
+			 _vm->_resource->convertResourceId(RID_ITE_TYCHO_MAP), resource, resourceLength);
 	if (resourceLength == 0) {
 		error("Interface::mapPanelShow() unable to load Tycho map resource");
 	}