[Scummvm-cvs-logs] SF.net SVN: scummvm:[48341] scummvm/trunk/engines/teenagent
megath at users.sourceforge.net
megath at users.sourceforge.net
Sat Mar 20 23:03:29 CET 2010
Revision: 48341
http://scummvm.svn.sourceforge.net/scummvm/?rev=48341&view=rev
Author: megath
Date: 2010-03-20 22:03:28 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
fixed inventory object overflow
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/inventory.cpp
scummvm/trunk/engines/teenagent/inventory.h
Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp 2010-03-20 20:37:36 UTC (rev 48340)
+++ scummvm/trunk/engines/teenagent/inventory.cpp 2010-03-20 22:03:28 UTC (rev 48341)
@@ -56,12 +56,13 @@
byte offsets = items[0];
assert(offsets == 92);
- for (byte i = 0; i <= offsets; ++i) {
+ for (byte i = 0; i < offsets; ++i) {
offset[i] = READ_LE_UINT16(items + i * 2 + 1);
}
+ offset[92] = items_size;
Resources *res = Resources::instance();
- 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 2010-03-20 20:37:36 UTC (rev 48340)
+++ scummvm/trunk/engines/teenagent/inventory.h 2010-03-20 22:03:28 UTC (rev 48341)
@@ -59,7 +59,7 @@
TeenAgentEngine *_engine;
Surface background;
byte *items;
- uint16 offset[93];
+ uint offset[93];
Common::Array<InventoryObject> objects;
byte *inventory;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list