mirror/fallout1-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout1-ce.git synced 2024-07-05 12:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review use_inventory_on

Browse Source 
Fixes #46
This commit is contained in:
Alexander Batalov 2023-02-27 15:10:35 +03:00
parent 0d80c14091
commit 8c8b2cc543
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/inventry.cc
View File

@ -2266,21 +2266,7 @@ void use_inventory_on(Object* a1)
int inventoryItemIndex = stack_offset[curr_stack] + keyCode - 1000;
if (inventoryItemIndex < pud->length) {
InventoryItem* inventoryItem = &(pud->items[inventoryItemIndex]);
if (isInCombat()) {
if (obj_dude->data.critter.combat.ap >= 2) {
if (action_use_an_item_on_object(obj_dude, a1, inventoryItem->item) != -1) {
int actionPoints = obj_dude->data.critter.combat.ap;
if (actionPoints < 2) {
obj_dude->data.critter.combat.ap = 0;
} else {
obj_dude->data.critter.combat.ap = actionPoints - 2;
}
intface_update_move_points(obj_dude->data.critter.combat.ap);
}
}
} else {
action_use_an_item_on_object(obj_dude, a1, inventoryItem->item);
}
action_use_an_item_on_object(stack[0], a1, inventoryItem->item);
keyCode = KEY_ESCAPE;
} else {
keyCode = -1;