Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-12-01 11:02:39 +0000
committerStijn Buys <ingar@osirion.org>2012-12-01 11:02:39 +0000
commit3658695c7764fa8e5d1c057ce8a3f6d208868bff (patch)
treef3cdb16775f13ab547e8f15dc3399d644b9360a6 /src/model
parent1f1090ff36c05bd375c8fb1abf4624ec95232bd9 (diff)
Corrected a bug which prevented submodel cannon tags from loading.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/mapfile.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/model/mapfile.cc b/src/model/mapfile.cc
index 93d21ad..a516649 100644
--- a/src/model/mapfile.cc
+++ b/src/model/mapfile.cc
@@ -2033,7 +2033,7 @@ Model * MapFile::load(std::string const &name)
}
// copy weapon tags
- for (Model::Weapons::const_iterator wit = submodel_model->weapons().begin(); wit != submodel_model->weapons().begin(); wit++) {
+ for (Model::Weapons::const_iterator wit = submodel_model->weapons().begin(); wit != submodel_model->weapons().end(); wit++) {
tag_weapon = new Weapon(*(*wit));
tag_weapon->get_location().assign(tag_submodel->location() + tag_submodel->axis() * (tag_weapon->location() - submodel_model->origin()) * tag_submodel->scale());
tag_weapon->set_radius(tag_weapon->radius() * tag_submodel->scale());