diff options
| author | Nicola Mettifogo | 2007-09-23 20:17:50 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-23 20:17:50 +0000 |
| commit | 05abbf49a2990fb16070682ab177aa88e823a382 (patch) | |
| tree | ebe9980cf25252e4725ed68a533289133c697d5e /engines/parallaction/exec_ns.cpp | |
| parent | 7da28f6129cf8b0fb06bbbc0f9d5e848c1695e9c (diff) | |
| download | scummvm-rg350-05abbf49a2990fb16070682ab177aa88e823a382.tar.gz scummvm-rg350-05abbf49a2990fb16070682ab177aa88e823a382.tar.bz2 scummvm-rg350-05abbf49a2990fb16070682ab177aa88e823a382.zip | |
Moved most of inventory-related code inside classes Inventory and InventoryRenderer. Shift is not completed, as new code doesn't handle selections yet (falling back to existent code).
svn-id: r29060
Diffstat (limited to 'engines/parallaction/exec_ns.cpp')
| -rw-r--r-- | engines/parallaction/exec_ns.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index 4238670d88..e413e8c7a4 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -641,13 +641,14 @@ void Parallaction_ns::jobToggleDoor(void *parm, Job *j) { int16 Parallaction::pickupItem(Zone *z) { int r = addInventoryItem(z->u.get->_icon); - if (r == 0) + if (r != -1) addJob(kJobRemovePickedItem, z, kPriority17 ); - return r; + return (r == -1); } void Parallaction_ns::jobRemovePickedItem(void *parm, Job *j) { + printf("picking up item\n"); Zone *z = (Zone*)parm; |