MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle projectiles in the Items module

develop
myk002 2021-08-19 17:44:13 -07:00
parent d3fdb5a6e0
commit 06a85d6f0d
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/modules/Items.cpp
Unescape Escape View File

@ -819,7 +819,6 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
switch (ref->getType()) switch (ref->getType())
{ {
case general_ref_type::PROJECTILE:
case general_ref_type::BUILDING_HOLDER: case general_ref_type::BUILDING_HOLDER:
case general_ref_type::BUILDING_CAGED: case general_ref_type::BUILDING_CAGED:
case general_ref_type::BUILDING_TRIGGER: case general_ref_type::BUILDING_TRIGGER:
@ -832,6 +831,26 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
} }
} }
if (df::general_ref *ref =
Items::getGeneralRef(item, general_ref_type::PROJECTILE))
{
int32_t proj_id = ((df::general_ref_projectile *)ref)->projectile_id;
df::proj_list_link *link = world->proj_list.next;
for (; link; link = link->next)
{
if (link->item->id != proj_id)
continue;
link->prev->next = link->next;
if (link->next)
link->next->prev = link->prev;
delete(link);
break;
}
return DFHack::removeRef(item->general_refs,
general_ref_type::PROJECTILE, ref->getID());
}
if (item->flags.bits.on_ground) if (item->flags.bits.on_ground)
{ {
if (!mc.removeItemOnGround(item)) if (!mc.removeItemOnGround(item))
@ -841,7 +860,8 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
item->flags.bits.on_ground = false; item->flags.bits.on_ground = false;
return true; return true;
} }
else if (item->flags.bits.in_inventory)
if (item->flags.bits.in_inventory)
{ {
bool found = false; bool found = false;
@ -906,7 +926,8 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
item->flags.bits.in_inventory = false; item->flags.bits.in_inventory = false;
return true; return true;
} }
else if (item->flags.bits.removed)
if (item->flags.bits.removed)
{ {
item->flags.bits.removed = false; item->flags.bits.removed = false;
@ -918,7 +939,7 @@ static bool detachItem(MapExtras::MapCache &mc, df::item *item)
return true; return true;
} }
else
return false; return false;
} }