[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.118,1.119

[Torbjörn Andersson]

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

Modified Files:
	interface.cpp 
Log Message:
When redrawing the inventory, clear every inventory slot - even the empty
ones - before drawing the object. This fixes a glitch when getting the ring
from the mud.


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- interface.cpp	17 Jul 2005 15:10:08 -0000	1.118
+++ interface.cpp	18 Jul 2005 14:37:55 -0000	1.119
@@ -1547,7 +1547,6 @@
 	Rect rect;
 	int ci;
 	ObjectData *obj;
-	Point point;
 	ci = _inventoryStart;
 	if (_inventoryStart != 0) {
 		drawPanelButtonArrow(backBuffer, &_mainPanel, _inventoryUpButton);		
@@ -1557,18 +1556,18 @@
 	}
 
 	for (i = 0; i < _mainPanel.buttonsCount; i++) {
-		if (ci >= _inventoryCount) {
-			break;
-		}
 		if (_mainPanel.buttons[i].type != kPanelButtonInventory) {
 			continue;
 		}
 		_mainPanel.calcPanelButtonRect(&_mainPanel.buttons[i], rect);
+
+		// TODO: Different colour for IHNM, probably.
+		backBuffer->drawRect(rect, kITEColorDarkGrey);
 		
-		point.x = rect.left;
-		point.y = rect.top;
-		obj = _vm->_actor->getObj(_inventory[ci]);		
-		_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_mainSprites, obj->spriteListResourceId, rect, 256);
+		if (ci < _inventoryCount) {
+			obj = _vm->_actor->getObj(_inventory[ci]);
+			_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_mainSprites, obj->spriteListResourceId, rect, 256);
+		}
 		
 		ci++;
 	}