Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-13 22:17:40 +0000
committerStijn Buys <ingar@osirion.org>2010-11-13 22:17:40 +0000
commitce6459b4588c2ac61f0cf57045324a8e27e34f41 (patch)
tree3b76532c410c71987ce19f414edef2ccb09560c4
parentc86b4142ff8adc8fc14f58d603b116dfd8ea6515 (diff)
corrected a bug where faction or template secondary color was not applied
-rw-r--r--src/game/base/faction.cc2
-rw-r--r--src/game/base/template.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/base/faction.cc b/src/game/base/faction.cc
index 6fb70cf..0220d3d 100644
--- a/src/game/base/faction.cc
+++ b/src/game/base/faction.cc
@@ -130,7 +130,7 @@ void Faction::apply(core::Entity *entity) const
entity->set_color(color());
// set secondary color
- entity->set_color(color());
+ entity->set_color_second(color_second());
}
} // namespace game
diff --git a/src/game/base/template.cc b/src/game/base/template.cc
index 04c8058..253562d 100644
--- a/src/game/base/template.cc
+++ b/src/game/base/template.cc
@@ -212,8 +212,8 @@ void Template::apply(core::Entity *entity) const
entity->set_color(color());
// set secondary color
- if (has_color())
- entity->set_color(color());
+ if (has_color_second())
+ entity->set_color_second(color_second());
}
} // namespace game