[Scummvm-cvs-logs] SF.net SVN: scummvm:[47147] scummvm/trunk/engines/teenagent/inventory.cpp
megath at users.sourceforge.net
megath at users.sourceforge.net
Fri Jan 8 08:58:04 CET 2010
Revision: 47147
http://scummvm.svn.sourceforge.net/scummvm/?rev=47147&view=rev
Author: megath
Date: 2010-01-08 07:58:04 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
added zero-object special case in combine table
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/inventory.cpp
Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp 2010-01-08 07:45:48 UTC (rev 47146)
+++ scummvm/trunk/engines/teenagent/inventory.cpp 2010-01-08 07:58:04 UTC (rev 47147)
@@ -82,7 +82,7 @@
}
void Inventory::remove(byte item) {
- debug(0, "removing %02x from inventory", item);
+ debug(0, "removing %u from inventory", item);
int i;
for (i = 0; i < 24; ++i) {
if (inventory[i] == item) {
@@ -109,14 +109,14 @@
void Inventory::add(byte item) {
if (has(item))
return;
- debug(0, "adding %02x to inventory", item);
+ debug(0, "adding %u to inventory", item);
for (int i = 0; i < 24; ++i) {
if (inventory[i] == 0) {
inventory[i] = item;
return;
}
}
- error("no room for item %02x", item);
+ error("no room for item %u", item);
}
bool Inventory::processEvent(const Common::Event &event) {
@@ -178,12 +178,15 @@
(id1 == table[0] && id2 == table[1]) ||
(id2 == table[0] && id1 == table[1])
) {
- remove(id1);
- remove(id2);
- debug(0, "adding object %u", table[2]);
- add(table[2]);
+ byte new_obj = table[2];
+ if (new_obj != 0) {
+ remove(id1);
+ remove(id2);
+ debug(0, "adding object %u", new_obj);
+ add(new_obj);
+ _engine->playSoundNow(69);
+ }
uint16 msg = READ_LE_UINT16(table + 3);
- _engine->playSoundNow(69);
_engine->displayMessage(msg);
activate(false);
resetSelectedObject();
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