diff options
| author | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
| commit | 95e1d101c82e43396fd93abfaa522e3651613c4c (patch) | |
| tree | 9d72f27e84a25c7a744b31eb7612698506ac5b68 /src/graphics/engine/planet.cpp | |
| parent | aa9df8b1f0fbbad4c7be0214a19a90b8495a2067 (diff) | |
| parent | c8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff) | |
| download | colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.gz colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.bz2 colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/graphics/engine/planet.cpp')
| -rw-r--r-- | src/graphics/engine/planet.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/graphics/engine/planet.cpp b/src/graphics/engine/planet.cpp index 0ac2524..3b9aa6c 100644 --- a/src/graphics/engine/planet.cpp +++ b/src/graphics/engine/planet.cpp @@ -147,7 +147,8 @@ void CPlanet::Draw() } void CPlanet::Create(int mode, Math::Point start, float dim, float speed, - float dir, const std::string& name, Math::Point uv1, Math::Point uv2) + float dir, const std::string& name, Math::Point uv1, Math::Point uv2, + bool transparent) { if (mode < 0) mode = 0; if (mode > 1) mode = 1; @@ -164,7 +165,7 @@ void CPlanet::Create(int mode, Math::Point start, float dim, float speed, planet.uv1 = uv1; planet.uv2 = uv2; - planet.transparent = planet.name.find("planet") != std::string::npos; + planet.transparent = transparent; m_planet[mode].push_back(planet); |