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

Fix problem with magic numbers in fastdwarf.

develop
Petr Mrázek 2011-10-28 06:22:07 +02:00
parent e74aae6f3e
commit 4688f6557e
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/dfhack/modules/Creatures.h
Unescape Escape View File

@ -616,7 +616,7 @@ namespace DFHack
std::vector<uint32_t> appearance; // 52c std::vector<uint32_t> appearance; // 52c
int16_t unk_53c; int16_t unk_53c;
int16_t unk_53e; int16_t unk_53e;
int16_t unk_540; int16_t job_counter; // tick until next job update?
int16_t unk_542; int16_t unk_542;
int16_t unk_544; int16_t unk_544;
int16_t unk_546; int16_t unk_546;

33
plugins/fastdwarf.cpp
Unescape Escape View File

@ -29,44 +29,43 @@ DFhackCExport command_result plugin_shutdown ( Core * c )
static int enable_fastdwarf; static int enable_fastdwarf;
// remove that if struct df_creature is updated
#define job_counter unk_540
DFhackCExport command_result plugin_onupdate ( Core * c ) DFhackCExport command_result plugin_onupdate ( Core * c )
{ {
if (!enable_fastdwarf) if (!enable_fastdwarf)
return CR_OK; return CR_OK;
static vector <df_creature*> *v;
df_creature *cre; df_creature *cre;
DFHack::Creatures * cr = c->getCreatures();
if (!v) { static vector <df_creature*> *v = cr->creatures;
OffsetGroup *ogc = c->vinfo->getGroup("Creatures"); uint32_t race = cr->GetDwarfRaceIndex();
v = (vector<df_creature*>*)ogc->getAddress("vector"); uint32_t civ = cr->GetDwarfCivId();
if (!v)
{
c->con.printerr("Unable to locate creature vector. Fastdwarf cancelled.\n");
} }
//c->Suspend(); // will deadlock in onupdate for (unsigned i=0 ; i<v->size() ; ++i)
for (unsigned i=0 ; i<v->size() ; ++i) { {
cre = v->at(i); cre = v->at(i);
if (cre->race == 241 && cre->job_counter > 0) if (cre->race == race && cre->civ == civ && cre->job_counter > 0)
cre->job_counter = 0; cre->job_counter = 0;
// could also patch the cre->current_job->counter // could also patch the cre->current_job->counter
} }
//c->Resume();
return CR_OK; return CR_OK;
} }
static command_result fastdwarf (Core * c, vector <string> & parameters) static command_result fastdwarf (Core * c, vector <string> & parameters)
{ {
if (parameters.size() == 1 && (parameters[0] == "0" || parameters[0] == "1")) { if (parameters.size() == 1 && (parameters[0] == "0" || parameters[0] == "1"))
{
if (parameters[0] == "0") if (parameters[0] == "0")
enable_fastdwarf = 0; enable_fastdwarf = 0;
else else
enable_fastdwarf = 1; enable_fastdwarf = 1;
c->con.print("fastdwarf %sactivated.\n", (enable_fastdwarf ? "" : "de")); c->con.print("fastdwarf %sactivated.\n", (enable_fastdwarf ? "" : "de"));
} else { }
c->con.print("Activate fastdwarf with 'fastdwarf 1', deactivate with 'fastdwarf 0'.\nCurrent state: %d.\n", enable_fastdwarf); else
{
c->con.print("Makes your minions move at ludicrous speeds.\nActivate with 'fastdwarf 1', deactivate with 'fastdwarf 0'.\nCurrent state: %d.\n", enable_fastdwarf);
} }
return CR_OK; return CR_OK;