summaryrefslogtreecommitdiff
path: root/plugins/colonies.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-01-10 00:45:43 +0100
committerPetr Mrázek2012-01-10 00:45:43 +0100
commit571498ea2100ae84b360c1ef54f727404be20986 (patch)
treec00321a305529aaddb63896c1a2cf2b37af81063 /plugins/colonies.cpp
parent1652e99a0b8e14335b3efe3c415e64a0f89293fa (diff)
downloaddfhack-571498ea2100ae84b360c1ef54f727404be20986.tar.gz
dfhack-571498ea2100ae84b360c1ef54f727404be20986.tar.bz2
dfhack-571498ea2100ae84b360c1ef54f727404be20986.tar.xz
Vermin tweaks.
Diffstat (limited to 'plugins/colonies.cpp')
-rw-r--r--plugins/colonies.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/colonies.cpp b/plugins/colonies.cpp
index 73106b96..3089b7cc 100644
--- a/plugins/colonies.cpp
+++ b/plugins/colonies.cpp
@@ -88,6 +88,7 @@ DFhackCExport command_result colonies (Core * c, vector <string> & parameters)
return CR_OK;
}
+//FIXME: this is probably bullshit
void destroyColonies()
{
uint32_t numSpawnPoints = Vermin::getNumVermin();
@@ -96,9 +97,9 @@ void destroyColonies()
Vermin::t_vermin sp;
Vermin::Read(i, sp);
- if (sp.in_use && Vermin::isWildColony(sp))
+ if (sp.visible && sp.is_colony)
{
- sp.in_use = false;
+ sp.visible = false;
Vermin::Write(i, sp);
}
}
@@ -127,7 +128,7 @@ void convertColonies(DFHack::Materials *Materials)
Vermin::t_vermin sp;
Vermin::Read(i, sp);
- if (sp.in_use && Vermin::isWildColony(sp))
+ if (sp.visible && sp.is_colony)
{
sp.race = bee_idx;
Vermin::Write(i, sp);
@@ -145,14 +146,14 @@ void showColonies(Core *c, DFHack::Materials *Materials)
Vermin::Read(i, sp);
- if (sp.in_use && Vermin::isWildColony(sp))
+ if (sp.visible && sp.is_colony)
{
numColonies++;
string race="(no race)";
if(sp.race != -1)
race = Materials->raceEx[sp.race].id;
- c->con.print("Spawn point %u: %s at %d:%d:%d\n", i,
+ c->con.print("Colony %u: %s at %d:%d:%d\n", i,
race.c_str(), sp.x, sp.y, sp.z);
}
}