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

removed underscores, adapted to structure (re)naming

develop
PatrikLundell 2020-04-15 10:18:37 +02:00
parent b0d184e2f9
commit f4f2aa0d5e
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,7 +658,7 @@ df::coord Items::getPosition(df::item *item)
switch (ref->type)
{
case specific_ref_type::VERMIN_ESCAPED_PET:
return ref->data.VERMIN_ESCAPED_PET->pos;
return ref->data.vermin->pos;
default:
break;

4
library/modules/Job.cpp
Unescape Escape View File

@ -311,7 +311,7 @@ void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *ref) {
auto ref = item->specific_refs[refIndex];
if (ref->type == df::specific_ref_type::JOB) {
if (ref->data.JOB == job) {
if (ref->data.job == job) {
vector_erase_at(item->specific_refs, refIndex);
delete ref;
} else {
@ -579,7 +579,7 @@ bool DFHack::Job::attachJobItem(df::job *job, df::item *item,
auto item_link = new df::specific_ref();
item_link->type = specific_ref_type::JOB;
item_link->data.JOB = job;
item_link->data.job = job;
item->specific_refs.push_back(item_link);
auto job_link = new df::job_item_ref();

8
library/modules/Units.cpp
Unescape Escape View File

@ -204,13 +204,13 @@ void Units::setNickname(df::unit *unit, std::string nick)
df::historical_figure *id_hfig = NULL;
switch (identity->type) {
case df::identity_type::Hiding_Curse:
case df::identity_type::HidingCurse:
case df::identity_type::Identity:
case df::identity_type::False_Identity:
case df::identity_type::FalseIdentity:
break; // We want the nickname to end up in the identity
case df::identity_type::Unk_1: // Guess, but that's how it worked in the past
case df::identity_type::True_Name:
case df::identity_type::TrueName:
case df::identity_type::Unk_4: // Pure guess, as this is a new case, still unseen
id_hfig = df::historical_figure::find(identity->histfig_nemesis_id);
break;
@ -258,7 +258,7 @@ bool Units::isHidingCurse(df::unit *unit)
if (!unit->job.hunt_target)
{
auto identity = Units::getIdentity(unit);
if (identity && identity->type == df::identity_type::Hiding_Curse)
if (identity && identity->type == df::identity_type::HidingCurse)
return true;
}

6
plugins/orders.cpp
Unescape Escape View File

@ -798,13 +798,13 @@ static command_result orders_clear_command(color_ostream & out)
{
delete condition;
}
if (order->anon_1)
if (order->items)
{
for (auto anon_1 : *order->anon_1)
for (auto anon_1 : *order->items)
{
delete anon_1;
}
delete order->anon_1;
delete order->items;
}
delete order;

10
plugins/stocks.cpp
Unescape Escape View File

@ -179,8 +179,8 @@ static map<df::item *, bool> items_in_cages;
static df::job *get_item_job(df::item *item)
{
auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
if (ref && ref->data.JOB)
return ref->data.JOB;
if (ref && ref->data.job)
return ref->data.job;
return nullptr;
}
@ -1008,12 +1008,12 @@ private:
if (item->flags.bits.in_job)
{
auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
if (ref && ref->data.JOB)
if (ref && ref->data.job)
{
if (ref->data.JOB->job_type == job_type::Eat || ref->data.JOB->job_type == job_type::Drink)
if (ref->data.job->job_type == job_type::Eat || ref->data.job->job_type == job_type::Drink)
return pos;
auto unit = Job::getWorker(ref->data.JOB);
auto unit = Job::getWorker(ref->data.job);
if (unit)
return unit->pos;
}

4
plugins/workflow.cpp
Unescape Escape View File

@ -1151,10 +1151,10 @@ static bool itemInRealJob(df::item *item)
return false;
auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
if (!ref || !ref->data.JOB)
if (!ref || !ref->data.job)
return true;
return ENUM_ATTR(job_type, type, ref->data.JOB->job_type)
return ENUM_ATTR(job_type, type, ref->data.job->job_type)
!= job_type_class::Hauling;
}