summaryrefslogtreecommitdiff
path: root/plugins/zone.cpp
diff options
context:
space:
mode:
authorRobert Heinrich2012-04-05 11:41:01 +0200
committerRobert Heinrich2012-04-05 11:41:01 +0200
commit511fceff0a8ab739dd04cb80527112cdeafc12b2 (patch)
tree586c237c3d207c514a9ba3269ce6a621dce982a4 /plugins/zone.cpp
parent33ceee8310f6dba6e7932e74dc74d7963ccc2417 (diff)
parent330118ee273f0184fc743ec9ef5a0203c7d08ef9 (diff)
downloaddfhack-511fceff0a8ab739dd04cb80527112cdeafc12b2.tar.gz
dfhack-511fceff0a8ab739dd04cb80527112cdeafc12b2.tar.bz2
dfhack-511fceff0a8ab739dd04cb80527112cdeafc12b2.tar.xz
Merge branch 'master' of git://github.com/peterix/dfhack
Diffstat (limited to 'plugins/zone.cpp')
-rw-r--r--plugins/zone.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index d73bc814..6b9204b5 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -832,12 +832,12 @@ df::unit * findFreeEgglayer()
bool unassignUnitFromZone(df::unit* unit)
{
bool success = false;
- for (size_t or = 0; or < unit->refs.size(); or++)
+ for (std::size_t idx = 0; idx < unit->refs.size(); idx++)
{
- df::general_ref * oldref = unit->refs[or];
+ df::general_ref * oldref = unit->refs[idx];
if(oldref->getType() == df::general_ref_type::BUILDING_CIVZONE_ASSIGNED)
{
- unit->refs.erase(unit->refs.begin() + or);
+ unit->refs.erase(unit->refs.begin() + idx);
df::building_civzonest * oldciv = (df::building_civzonest *) oldref->getBuilding();
for(size_t oc=0; oc<oldciv->assigned_creature.size(); oc++)
{