[Scummvm-cvs-logs] CVS: scummvm/sword1 menu.cpp,1.10,1.11

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv2699

Modified Files:
	menu.cpp 
Log Message:
When showMenu() redraws the menu, redraw the empty slots as well. This
fixes the "ghost" items left behind when combining two inventory objects in
such a way that one of them is used up.


Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- menu.cpp	23 Dec 2003 00:59:18 -0000	1.10
+++ menu.cpp	28 Dec 2003 18:10:18 -0000	1.11
@@ -278,8 +278,12 @@
 void SwordMenu::showMenu(uint8 menuType) {
 	if (menuType == MENU_TOP) {
 		if (_objectBarStatus == MENU_OPEN) {
-			for (uint8 cnt = 0; cnt < _inMenu; cnt++)
-				_objects[cnt]->draw();
+			for (uint8 cnt = 0; cnt < 16; cnt++) {
+				if (_objects[cnt])
+					_objects[cnt]->draw();
+				else
+					_screen->showFrame(cnt * 40, 0, 0xffffffff, 0);
+			}
 		} else if (_objectBarStatus == MENU_CLOSED) {
 			_objectBarStatus = MENU_OPENING;
 			_fadeObject = 0;