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

Update structures and fix broken things.

develop
Alexander Gavrilov 2014-04-04 22:34:39 +04:00
parent 788bc55096
commit 7aecffe0cd
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,7 +705,7 @@ static void resetUnitInvFlags(df::unit *unit, df::unit_inventory_item *inv_item)
} }
else if (inv_item->mode == df::unit_inventory_item::StuckIn) else if (inv_item->mode == df::unit_inventory_item::StuckIn)
{ {
unit->flags3.bits.unk2 = false; unit->flags3.bits.stuck_weapon_computed = false;
} }
} }

2
library/xml

@ -1 +1 @@
Subproject commit a845f9c3da4835553cd756a3ecba70399d55dab5 Subproject commit ca15aeedffdd48da752ba29bf4d1a8effbcffd75

8
plugins/autoSyndrome.cpp
Unescape Escape View File

@ -472,15 +472,15 @@ int32_t giveSyndrome(color_ostream& out, int32_t workerId, df::syndrome* syndrom
unitSyndrome->year = DFHack::World::ReadCurrentYear(); unitSyndrome->year = DFHack::World::ReadCurrentYear();
unitSyndrome->year_time = DFHack::World::ReadCurrentTick(); unitSyndrome->year_time = DFHack::World::ReadCurrentTick();
unitSyndrome->ticks = 0; unitSyndrome->ticks = 0;
unitSyndrome->unk1 = 0; unitSyndrome->wound_id = -1;
unitSyndrome->flags = 0; //TODO: typecast? unitSyndrome->flags = 0; //TODO: typecast?
for ( size_t a = 0; a < syndrome->ce.size(); a++ ) { for ( size_t a = 0; a < syndrome->ce.size(); a++ ) {
df::unit_syndrome::T_symptoms* symptom = new df::unit_syndrome::T_symptoms(); df::unit_syndrome::T_symptoms* symptom = new df::unit_syndrome::T_symptoms();
symptom->unk1 = 0; symptom->quantity = 0;
symptom->unk2 = 0; symptom->delay = 0;
symptom->ticks = 0; symptom->ticks = 0;
symptom->flags = 2; //TODO: ??? symptom->flags.bits.active = true; //TODO: ???
unitSyndrome->symptoms.push_back(symptom); unitSyndrome->symptoms.push_back(symptom);
} }
unit->syndromes.active.push_back(unitSyndrome); unit->syndromes.active.push_back(unitSyndrome);

4
plugins/autolabor.cpp
Unescape Escape View File

@ -1051,8 +1051,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
{ {
df::activity_info *act = ui->activities[i]; df::activity_info *act = ui->activities[i];
if (!act) continue; if (!act) continue;
bool p1 = act->person1 == dwarfs[dwarf]; bool p1 = act->unit_actor == dwarfs[dwarf];
bool p2 = act->person2 == dwarfs[dwarf]; bool p2 = act->unit_noble == dwarfs[dwarf];
if (p1 || p2) if (p1 || p2)
{ {

4
plugins/devel/autolabor2.cpp
Unescape Escape View File

@ -1808,8 +1808,8 @@ private:
{ {
df::activity_info *act = ui->activities[i]; df::activity_info *act = ui->activities[i];
if (!act) continue; if (!act) continue;
bool p1 = act->person1 == dwarf->dwarf; bool p1 = act->unit_actor == dwarf->dwarf;
bool p2 = act->person2 == dwarf->dwarf; bool p2 = act->unit_noble == dwarf->dwarf;
if (p1 || p2) if (p1 || p2)
{ {

2
plugins/strangemood.cpp
Unescape Escape View File

@ -1278,7 +1278,7 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
unit->path.dest.x = -30000; unit->path.dest.x = -30000;
unit->path.dest.y = -30000; unit->path.dest.y = -30000;
unit->path.dest.z = -30000; unit->path.dest.z = -30000;
unit->path.unk_ae = -1; unit->path.goal = unit_path_goal::None;
unit->path.path.x.clear(); unit->path.path.x.clear();
unit->path.path.y.clear(); unit->path.path.y.clear();
unit->path.path.z.clear(); unit->path.path.z.clear();