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

Merge remote-tracking branch 'dfhack/develop' into HEAD

develop
expwnent 2014-09-19 16:39:11 -04:00
parent a0c55b8bc5 e6901a87d3
commit ebab62744e
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif() endif()
# set up versioning. # set up versioning.
set(DF_VERSION "0.40.12") set(DF_VERSION "0.40.13")
SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.") SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.")
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

2
library/xml

@ -1 +1 @@
Subproject commit 08064793ceb3d54e8e1fdeb73c550e19ba886e5c Subproject commit 93606b34b78a94b201704adb5c9ae28af304cdb1

2
plugins/add-spatter.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "df/reaction_product_item_improvementst.h" #include "df/reaction_product_item_improvementst.h"
#include "df/reaction_product_improvement_flags.h" #include "df/reaction_product_improvement_flags.h"
#include "df/matter_state.h" #include "df/matter_state.h"
#include "df/contaminant.h" #include "df/spatter.h"
#include "MiscUtils.h" #include "MiscUtils.h"

6
plugins/cleaners.cpp
Unescape Escape View File

@ -7,13 +7,11 @@
#include "DataDefs.h" #include "DataDefs.h"
#include "df/item_actual.h" #include "df/item_actual.h"
#include "df/unit.h" #include "df/unit.h"
#include "df/unit_spatter.h" #include "df/spatter.h"
#include "df/matter_state.h" #include "df/matter_state.h"
#include "df/global_objects.h" #include "df/global_objects.h"
#include "df/builtin_mats.h" #include "df/builtin_mats.h"
#include "df/contaminant.h"
#include "df/plant.h" #include "df/plant.h"
#include "df/plant_spatter.h"
using std::vector; using std::vector;
using std::string; using std::string;
@ -91,7 +89,7 @@ command_result cleanitems (color_ostream &out)
df::item_actual *item = (df::item_actual *)world->items.all[i]; df::item_actual *item = (df::item_actual *)world->items.all[i];
if (item->contaminants && item->contaminants->size()) if (item->contaminants && item->contaminants->size())
{ {
std::vector<df::contaminant*> saved; std::vector<df::spatter*> saved;
for (size_t j = 0; j < item->contaminants->size(); j++) for (size_t j = 0; j < item->contaminants->size(); j++)
{ {
auto obj = (*item->contaminants)[j]; auto obj = (*item->contaminants)[j];

2
plugins/tweak.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
#include "df/item_barst.h" #include "df/item_barst.h"
#include "df/item_threadst.h" #include "df/item_threadst.h"
#include "df/item_clothst.h" #include "df/item_clothst.h"
#include "df/contaminant.h" #include "df/spatter.h"
#include "df/layer_object.h" #include "df/layer_object.h"
#include "df/reaction.h" #include "df/reaction.h"
#include "df/reaction_reagent_itemst.h" #include "df/reaction_reagent_itemst.h"