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

follow rename Carried->Hauled in df-structures unit inventory mode

develop
jj 2012-10-22 19:37:12 +02:00
parent 46938625fd
commit cfbdf47f6e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/modules/Items.h
Unescape Escape View File

@ -161,7 +161,7 @@ DFHACK_EXPORT bool moveToGround(MapExtras::MapCache &mc, df::item *item, df::coo
DFHACK_EXPORT bool moveToContainer(MapExtras::MapCache &mc, df::item *item, df::item *container); DFHACK_EXPORT bool moveToContainer(MapExtras::MapCache &mc, df::item *item, df::item *container);
DFHACK_EXPORT bool moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,int16_t use_mode); DFHACK_EXPORT bool moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,int16_t use_mode);
DFHACK_EXPORT bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *unit, DFHACK_EXPORT bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *unit,
df::unit_inventory_item::T_mode mode = df::unit_inventory_item::Carried, int body_part = -1); df::unit_inventory_item::T_mode mode = df::unit_inventory_item::Hauled, int body_part = -1);
/// Makes the item removed and marked for garbage collection /// Makes the item removed and marked for garbage collection
DFHACK_EXPORT bool remove(MapExtras::MapCache &mc, df::item *item, bool no_uncat = false); DFHACK_EXPORT bool remove(MapExtras::MapCache &mc, df::item *item, bool no_uncat = false);

6
plugins/advtools.cpp
Unescape Escape View File

@ -321,7 +321,7 @@ std::string getUnitNameProfession(df::unit *unit)
} }
enum InventoryMode { enum InventoryMode {
INV_CARRIED, INV_HAULED,
INV_WEAPON, INV_WEAPON,
INV_WORN, INV_WORN,
INV_IN_CONTAINER INV_IN_CONTAINER
@ -355,8 +355,8 @@ void listUnitInventory(std::vector<inv_item> *list, df::unit *unit)
InventoryMode mode; InventoryMode mode;
switch (item->mode) { switch (item->mode) {
case df::unit_inventory_item::Carried: case df::unit_inventory_item::Hauled:
mode = INV_CARRIED; mode = INV_HAULED;
break; break;
case df::unit_inventory_item::Weapon: case df::unit_inventory_item::Weapon:
mode = INV_WEAPON; mode = INV_WEAPON;