[Scummvm-cvs-logs] CVS: scummvm/bs2/driver menu.cpp,1.3,1.4

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv14994

Modified Files:
	menu.cpp 
Log Message:
SetMenuIcon(), other stubs in menu.cpp will have to be done for things to be visible, don't have time to do this at the moment. As a side note the demo is now finishable even though you can't see the inventory :)

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- menu.cpp	28 Jul 2003 07:22:40 -0000	1.3
+++ menu.cpp	20 Aug 2003 11:13:13 -0000	1.4
@@ -130,21 +130,19 @@
 {
 	RDMENU_HIDDEN, RDMENU_HIDDEN
 };
-/*
+
 static uint8 *icons[2][RDMENU_MAXPOCKETS] =
 {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
-*/
 
-/*
-static LPDIRECTDRAWSURFACE lpIconSurface[2][RDMENU_MAXPOCKETS] = 
+// static LPDIRECTDRAWSURFACE lpIconSurface[2][RDMENU_MAXPOCKETS] = 
+static Surface *lpIconSurface[2][RDMENU_MAXPOCKETS] = 
 {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
-*/
 
 static uint8 pocketStatus[2][RDMENU_MAXPOCKETS] =
 {
@@ -154,7 +152,7 @@
 
 //static uint8 menuCounter[2];
 //static uint8 lastIcon[2];
-//static uint8 iconCount = 0;
+static uint8 iconCount = 0;
 
 
 
@@ -517,10 +515,11 @@
 int32 SetMenuIcon(uint8 menu, uint8 pocket, uint8 *icon)
 
 {
-	warning("stub SetMenuIcon( %d, %d )", menu, pocket);
-/*
+	debug(5, "stub SetMenuIcon( %d, %d )", menu, pocket);
 
-	HRESULT			hr;
+
+//	HRESULT			hr;
+	int32 hr;
 
 
 	//	Check for invalid menu parameter.
@@ -537,7 +536,8 @@
 		iconCount--;
 		free(icons[menu][pocket]);
 		icons[menu][pocket] = NULL;
-		IDirectDrawSurface2_Release(lpIconSurface[menu][pocket]);
+//		IDirectDrawSurface2_Release(lpIconSurface[menu][pocket]);
+		delete lpIconSurface[menu][pocket];
 		lpIconSurface[menu][pocket] = NULL;
 	}
 
@@ -551,14 +551,14 @@
 		memcpy(icons[menu][pocket], icon, RDMENU_ICONWIDE * RDMENU_ICONDEEP);
 
 		hr = CreateIconSurface(menu, pocket);
-		if (hr != DD_OK)
+		//if (hr != DD_OK)
+		if (hr != RD_OK)
 			return(hr);
 
 		hr = LoadIconSurface(menu, pocket);
 		if (hr != RD_OK)
 			return(hr);
 	}
-*/
 	return RD_OK;
 }