[Scummvm-cvs-logs] SF.net SVN: scummvm:[33795] scummvm/trunk/engines/cine/various.cpp

[buddha_ at users.sourceforge.net]

Revision: 33795
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33795&view=rev
Author:   buddha_
Date:     2008-08-12 14:44:44 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Implemented Operation Stealth specific parts of processInventory and added another mouse button waiting loop into the function's end (It's in both Future Wars and Operation Stealth). Fixes inventory showing in Operation Stealth.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/various.cpp

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2008-08-12 14:31:38 UTC (rev 33794)
+++ scummvm/trunk/engines/cine/various.cpp	2008-08-12 14:44:44 UTC (rev 33795)
@@ -1416,19 +1416,38 @@
 }
 
 void processInventory(int16 x, int16 y) {
-	int16 listSize = buildObjectListCommand(-2);
 	uint16 button;
+	int menuWidth;
+	int listSize;
+	int commandParam;
 
+	if (g_cine->getGameType() == Cine::GType_FW) {
+		menuWidth = 140;
+		commandParam = -2;
+	} else { // Operation Stealth
+		menuWidth = 160;
+		commandParam = -3;
+	}
+
+	listSize = buildObjectListCommand(commandParam);
+
 	if (!listSize)
 		return;
 
-	renderer->drawMenu(objectListCommand, listSize, x, y, 140, -1);
+	renderer->drawMenu(objectListCommand, listSize, x, y, menuWidth, -1);
 	renderer->blit();
 
 	do {
 		manageEvents();
 		getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
 	} while (!button);
+
+	do {
+		manageEvents();
+		getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
+	} while (button);
+
+	// TODO: Both Future Wars and Operation Stealth call showMouse, drawMouse or something similar here.
 }
 
 int16 buildObjectListCommand(int16 param) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.