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

Merge https://github.com/Caldfir/dfhack

develop
Petr Mrázek 2012-05-18 17:42:34 +02:00
parent ed6da7618a 035d65536b
commit 1333dc569f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ using namespace std;
#include "df/world.h"
#include "df/ui.h"
#include "df/job.h"
#include "df/unit_inventory_item.h"
#include "df/unit_soul.h"
#include "df/nemesis_record.h"
@ -215,24 +216,18 @@ void Units::CopyCreature(df::unit * source, t_unit & furball)
}
}
*/
/*
furball.current_job.occupationPtr = p->readDWord (addr_cr + offs.current_job_offset);
if(furball.current_job.occupationPtr)
{
furball.current_job.active = true;
furball.current_job.jobType = p->readByte (furball.current_job.occupationPtr + offs.job_type_offset );
furball.current_job.jobId = p->readWord (furball.current_job.occupationPtr + offs.job_id_offset);
}
else
if(source->job.current_job == NULL)
{
furball.current_job.active = false;
}
*/
// no jobs for now...
else
{
furball.current_job.active = false;
furball.current_job.active = true;
furball.current_job.jobType = source->job.current_job->job_type;
furball.current_job.jobId = source->job.current_job->id;
}
}
int32_t Units::FindIndexById(int32_t creature_id)
{
return df::unit::binsearch_index(world->units.all, creature_id);