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

Follow a typo fix in flag name.

develop
Alexander Gavrilov 2012-03-30 10:44:52 +04:00
parent 6a7e7241b8
commit 81bc73f435
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 3e1c728640d8f5a9501908064a2d5385a156058c Subproject commit 5651ab46643b87ad678e0b01b9376959d7a6745b

8
plugins/autodump.cpp
Unescape Escape View File

@ -232,7 +232,7 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
if (here && pos_item != pos_cursor) if (here && pos_item != pos_cursor)
continue; continue;
itm->flags.bits.garbage_colect = true; itm->flags.bits.garbage_collect = true;
// Cosmetic changes: make them disappear from view instantly // Cosmetic changes: make them disappear from view instantly
itm->flags.bits.forbid = true; itm->flags.bits.forbid = true;
@ -322,7 +322,7 @@ command_result df_autodump_destroy_item(color_ostream &out, vector <string> & pa
df::item_flags old_flags = pending_destroy[item->id]; df::item_flags old_flags = pending_destroy[item->id];
pending_destroy.erase(item->id); pending_destroy.erase(item->id);
item->flags.bits.garbage_colect = false; item->flags.bits.garbage_collect = false;
item->flags.bits.hidden = old_flags.bits.hidden; item->flags.bits.hidden = old_flags.bits.hidden;
item->flags.bits.dump = old_flags.bits.dump; item->flags.bits.dump = old_flags.bits.dump;
item->flags.bits.forbid = old_flags.bits.forbid; item->flags.bits.forbid = old_flags.bits.forbid;
@ -330,7 +330,7 @@ command_result df_autodump_destroy_item(color_ostream &out, vector <string> & pa
} }
// Check the item is good to destroy // Check the item is good to destroy
if (item->flags.bits.garbage_colect) if (item->flags.bits.garbage_collect)
{ {
out.printerr("Item is already marked for destroy.\n"); out.printerr("Item is already marked for destroy.\n");
return CR_FAILURE; return CR_FAILURE;
@ -357,7 +357,7 @@ command_result df_autodump_destroy_item(color_ostream &out, vector <string> & pa
// Set the flags // Set the flags
pending_destroy[item->id] = item->flags; pending_destroy[item->id] = item->flags;
item->flags.bits.garbage_colect = true; item->flags.bits.garbage_collect = true;
item->flags.bits.hidden = true; item->flags.bits.hidden = true;
item->flags.bits.dump = true; item->flags.bits.dump = true;
item->flags.bits.forbid = true; item->flags.bits.forbid = true;

2
plugins/drybuckets.cpp
Unescape Escape View File

@ -32,7 +32,7 @@ command_result df_drybuckets (color_ostream &out, vector <string> & parameters)
df::item *item = world->items.all[i]; df::item *item = world->items.all[i];
if ((item->getType() == item_type::LIQUID_MISC) && (item->getMaterial() == builtin_mats::WATER)) if ((item->getType() == item_type::LIQUID_MISC) && (item->getMaterial() == builtin_mats::WATER))
{ {
item->flags.bits.garbage_colect = 1; item->flags.bits.garbage_collect = 1;
dried_total++; dried_total++;
} }
} }

2
plugins/seedwatch.cpp
Unescape Escape View File

@ -32,7 +32,7 @@ bool ignoreSeeds(df::item_flags& f) // seeds with the following flags should not
return return
f.bits.dump || f.bits.dump ||
f.bits.forbid || f.bits.forbid ||
f.bits.garbage_colect || f.bits.garbage_collect ||
f.bits.hidden || f.bits.hidden ||
f.bits.hostile || f.bits.hostile ||
f.bits.on_fire || f.bits.on_fire ||

6
plugins/workflow.cpp
Unescape Escape View File

@ -1032,7 +1032,7 @@ static void dryBucket(df::item *item)
obj->getType() == item_type::LIQUID_MISC && obj->getType() == item_type::LIQUID_MISC &&
obj->getMaterial() == builtin_mats::WATER) obj->getMaterial() == builtin_mats::WATER)
{ {
obj->flags.bits.garbage_colect = true; obj->flags.bits.garbage_collect = true;
obj->flags.bits.hidden = true; obj->flags.bits.hidden = true;
} }
} }
@ -1049,7 +1049,7 @@ static bool itemBusy(df::item *item)
if (ref->getType() == general_ref_type::CONTAINS_ITEM) if (ref->getType() == general_ref_type::CONTAINS_ITEM)
{ {
df::item *obj = ref->getItem(); df::item *obj = ref->getItem();
if (obj && !obj->flags.bits.garbage_colect) if (obj && !obj->flags.bits.garbage_collect)
return true; return true;
} }
else if (ref->getType() == general_ref_type::CONTAINS_UNIT) else if (ref->getType() == general_ref_type::CONTAINS_UNIT)
@ -1105,7 +1105,7 @@ static void map_job_items(color_ostream &out)
bad_flags.whole = 0; bad_flags.whole = 0;
#define F(x) bad_flags.bits.x = true; #define F(x) bad_flags.bits.x = true;
F(dump); F(forbid); F(garbage_colect); F(dump); F(forbid); F(garbage_collect);
F(hostile); F(on_fire); F(rotten); F(trader); F(hostile); F(on_fire); F(rotten); F(trader);
F(in_building); F(construction); F(artifact1); F(in_building); F(construction); F(artifact1);
#undef F #undef F