From ce6459b4588c2ac61f0cf57045324a8e27e34f41 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 13 Nov 2010 22:17:40 +0000 Subject: corrected a bug where faction or template secondary color was not applied --- src/game/base/faction.cc | 2 +- src/game/base/template.cc | 4 ++-- 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 -- cgit v1.2.3