[colobot] 24/377: Restored CreateSpot code in Teen objects

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 3a7aa4ae9cbd61981a8a2d8f455f83753eef8ebc
Author: krzys-h <krzys_h at interia.pl>
Date:   Wed Sep 30 18:14:53 2015 +0200

    Restored CreateSpot code in Teen objects
---
 data                          | 2 +-
 src/object/object_factory.cpp | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/data b/data
index d90d0da..68682ab 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit d90d0da944ad77e461dbc7b623491016f952fc21
+Subproject commit 68682ab0c8c5918b41577e8713c63a6cf90293ef
diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp
index d39644a..090d009 100644
--- a/src/object/object_factory.cpp
+++ b/src/object/object_factory.cpp
@@ -1136,14 +1136,12 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
         m_particle->CreateParticle(pos, Math::Vector(0.0f, 0.0f, 0.0f), Math::Point(20.0f, 20.0f), Gfx::PARTISELY, 1.0f, 0.0f, 0.0f);
 
         pos = Math::Transform(*mat, Math::Vector(-65.0f, 40.0f, 0.0f));
-        /* TODO: ?
         Gfx::Color color;
         color.r = 4.0f;
         color.g = 2.0f;
         color.b = 0.0f;  // yellow-orange
         color.a = 0.0f;
-        m_main->CreateSpot(pos, color);
-        */
+        CRobotMain::GetInstancePointer()->CreateSpot(pos, color); // TODO: Don't use singleton
     }
 
     if ( type == OBJECT_TEEN12 )  // coke
@@ -1399,15 +1397,13 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
         pos = Math::Transform(*mat, Math::Vector(0.0f, 50.0f, 0.0f));
         m_particle->CreateParticle(pos, Math::Vector(0.0f, 0.0f, 0.0f), Math::Point(100.0f, 100.0f), Gfx::PARTISELY, 1.0f, 0.0f, 0.0f);
 
-        /* TODO: ?
         pos = Math::Transform(*mat, Math::Vector(0.0f, 50.0f, 0.0f));
         Gfx::Color color;
         color.r = 4.0f;
         color.g = 2.0f;
         color.b = 0.0f;  // yellow-orange
         color.a = 0.0f;
-        m_main->CreateSpot(pos, color);
-        */
+        CRobotMain::GetInstancePointer()->CreateSpot(pos, color); // TODO: Don't use singleton
     }
 
     if ( type == OBJECT_TEEN27 )  // large plant?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git