[Scummvm-cvs-logs] SF.net SVN: scummvm:[40750] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 40750
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40750&view=rev
Author:   peres001
Date:     2009-05-21 08:06:15 +0000 (Thu, 21 May 2009)

Log Message:
-----------
Made BRA demos start again by partially reverting commit 39773. Multiple inventory support must be done somehow differently.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/inventory.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parallaction_br.cpp

Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp	2009-05-21 07:23:48 UTC (rev 40749)
+++ scummvm/trunk/engines/parallaction/inventory.cpp	2009-05-21 08:06:15 UTC (rev 40750)
@@ -351,13 +351,11 @@
 }
 
 void Parallaction_br::initInventory() {
-	for (int i = 0; i < 3; ++i) {
-		_inventory[i] = new Inventory(&_invProps_BR, _verbs_BR);
-		assert(_inventory[i]);
-	}
+	_inventory = new Inventory(&_invProps_BR, _verbs_BR);
+	assert(_inventory);
 	_inventoryRenderer = new InventoryRenderer(this, &_invProps_BR);
 	assert(_inventoryRenderer);
-	// don't bind here, wait for changeCharacter()
+	_inventoryRenderer->bindInventory(_inventory);
 }
 
 void Parallaction_ns::destroyInventory() {
@@ -369,12 +367,8 @@
 
 void Parallaction_br::destroyInventory() {
 	delete _inventoryRenderer;
-	delete _inventory[0];
-	delete _inventory[1];
-	delete _inventory[2];
-	_inventory[0] = 0;
-	_inventory[1] = 0;
-	_inventory[2] = 0;
+	delete _inventory;
+	_inventory = 0;
 	_inventoryRenderer = 0;
 }
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2009-05-21 07:23:48 UTC (rev 40749)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2009-05-21 08:06:15 UTC (rev 40750)
@@ -547,7 +547,7 @@
 	LocationParser_br		*_locationParser;
 	ProgramParser_br		*_programParser;
 	SoundMan_br				*_soundManI;
-	Inventory				*_inventory[3];
+	Inventory				*_inventory;
 
 	int32		_counters[32];
 	Table		*_countersNames;

Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp	2009-05-21 07:23:48 UTC (rev 40749)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp	2009-05-21 08:06:15 UTC (rev 40750)
@@ -455,9 +455,6 @@
 		_char.setName(name);
 		_char._ani->gfxobj = _gfx->loadCharacterAnim(name);
 		_char._talk = _disk->loadTalk(name);
-
-		// TODO: select the inventory according to character
-		_inventoryRenderer->bindInventory(_inventory[0]);
 	}
 
 	_char._ani->_flags |= kFlagsActive;


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