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

Merge pull request #542 from scamtank/fix-armory 

fix-armory: Substitute removed jobtypes with working ones
develop
Lethosor 2015-02-09 11:07:51 -05:00
parent 383baea8da 9c4dbea392
commit f287a99a37
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/CMakeLists.txt
Unescape Escape View File

@ -117,7 +117,7 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(fastdwarf fastdwarf.cpp) DFHACK_PLUGIN(fastdwarf fastdwarf.cpp)
DFHACK_PLUGIN(feature feature.cpp) DFHACK_PLUGIN(feature feature.cpp)
DFHACK_PLUGIN(filltraffic filltraffic.cpp) DFHACK_PLUGIN(filltraffic filltraffic.cpp)
# DFHACK_PLUGIN(fix-armory fix-armory.cpp) DFHACK_PLUGIN(fix-armory fix-armory.cpp)
DFHACK_PLUGIN(fixpositions fixpositions.cpp) DFHACK_PLUGIN(fixpositions fixpositions.cpp)
DFHACK_PLUGIN(fixveins fixveins.cpp) DFHACK_PLUGIN(fixveins fixveins.cpp)
DFHACK_PLUGIN(flows flows.cpp) DFHACK_PLUGIN(flows flows.cpp)

4
plugins/fix-armory.cpp
Unescape Escape View File

@ -509,11 +509,11 @@ static bool try_store_item(df::building *target, df::item *item)
job->flags.bits.specific_dropoff = true; job->flags.bits.specific_dropoff = true;
break; break;
case building_type::Cabinet: case building_type::Cabinet:
job->job_type = job_type::StoreItemInCabinet; job->job_type = job_type::StoreOwnedItem;
dest = true; dest = true;
break; break;
default: default:
job->job_type = job_type::StoreItemInChest; job->job_type = job_type::StoreItemInHospital;
dest = true; dest = true;
break; break;
} }