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

Merge derp fixed.

develop
Petr Mrázek 2012-05-19 20:03:08 +02:00
parent 51f06c78fc
commit bc7dbe1175
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -708,8 +708,8 @@ bool DFHack::Items::moveToContainer(MapExtras::MapCache &mc, df::item *item, df:
return true; return true;
} }
<<<<<<< HEAD
DFHACK_EXPORT bool DFHack::Items::moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,int16_t use_mode) bool DFHack::Items::moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,int16_t use_mode)
{ {
CHECK_NULL_POINTER(item); CHECK_NULL_POINTER(item);
CHECK_NULL_POINTER(building); CHECK_NULL_POINTER(building);
@ -740,7 +740,6 @@ DFHACK_EXPORT bool DFHack::Items::moveToBuilding(MapExtras::MapCache &mc, df::it
building->contained_items.push_back(con); building->contained_items.push_back(con);
return true; return true;
} }
=======
bool DFHack::Items::moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *unit, df::body_part_raw * targetBodyPart, bool ignoreRestrictions, int multiEquipLimit, bool verbose) bool DFHack::Items::moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *unit, df::body_part_raw * targetBodyPart, bool ignoreRestrictions, int multiEquipLimit, bool verbose)
{ {
@ -953,4 +952,3 @@ bool DFHack::Items::moveToInventory(MapExtras::MapCache &mc, df::item *item, df:
if (verbose) { Core::print(" Success!\n"); } if (verbose) { Core::print(" Success!\n"); }
return true; return true;
} }
>>>>>>> 0d2849ca5aef2bb96cc786d9f63661a010f6e766