[Scummvm-cvs-logs] SF.net SVN: scummvm:[45577] scummvm/trunk/engines/teenagent

[megath at users.sourceforge.net]

Revision: 45577
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45577&view=rev
Author:   megath
Date:     2009-10-31 19:03:44 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
fixed bird-assert from chapter 1

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

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2009-10-31 18:53:30 UTC (rev 45576)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2009-10-31 19:03:44 UTC (rev 45577)
@@ -46,11 +46,11 @@
 
 	byte offsets = items->readByte();
 	assert(offsets == 92);
-	for (byte i = 0; i < offsets; ++i) {
+	for (byte i = 0; i <= offsets; ++i) {
 		offset[i] = items->readUint16LE();
 	}
 
-	for (byte i = 0; i < 92; ++i) {
+	for (byte i = 0; i <= 92; ++i) {
 		InventoryObject io;
 		uint16 obj_addr = res->dseg.get_word(0xc4a4 + i * 2);
 		if (obj_addr != 0) 

Modified: scummvm/trunk/engines/teenagent/inventory.h
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.h	2009-10-31 18:53:30 UTC (rev 45576)
+++ scummvm/trunk/engines/teenagent/inventory.h	2009-10-31 19:03:44 UTC (rev 45577)
@@ -58,7 +58,7 @@
 	TeenAgentEngine *_engine;
 	Surface background;
 	Common::SeekableReadStream *items;
-	uint16 offset[92];
+	uint16 offset[93];
 
 	Common::Array<InventoryObject> objects;
 	byte *inventory;

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2009-10-31 18:53:30 UTC (rev 45576)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2009-10-31 19:03:44 UTC (rev 45577)
@@ -185,6 +185,7 @@
 	memcpy(res->dseg.ptr(0x6478), data, sizeof(data));
 
 	scene->clear();
+	inventory->activate(false);
 
 	setMusic(Resources::instance()->dseg.get_byte(0xDB90));
 


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