diff options
| author | XienDev <XienDev@gmail.com> | 2013-04-29 13:55:02 +0300 |
|---|---|---|
| committer | XienDev <XienDev@gmail.com> | 2013-04-29 13:55:02 +0300 |
| commit | d425e09186cb93d4c873665c87535beb050c3389 (patch) | |
| tree | c233f3f2d9c4ec1b1965eb5f8c312d5b2187778e | |
| parent | 5fd64624d34e9332b726ecaffecbcbd6686a7d2e (diff) | |
| parent | 658ebe015f98b8f11f8d46110b5e089323f7d8cb (diff) | |
| download | colobot-d425e09186cb93d4c873665c87535beb050c3389.tar.gz colobot-d425e09186cb93d4c873665c87535beb050c3389.tar.bz2 colobot-d425e09186cb93d4c873665c87535beb050c3389.zip | |
Merge branch 'shadow-bug' into fix-for-shadows
| -rw-r--r-- | src/graphics/engine/engine.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionvehicle.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 274e179..5d77e29 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -3651,7 +3651,7 @@ void CEngine::DrawShadow() float lastIntensity = -1.0f; for (int i = 0; i < static_cast<int>( m_shadows.size() ); i++) { - if (m_shadows[i].hide) + if (m_shadows[i].hide || !m_shadows[i].used) continue; Math::Vector pos = m_shadows[i].pos; // pos = center of the shadow on the ground diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 44b8fdd..2eed83e 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -931,6 +931,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); pPower->SetObjectRank(0, rank); + pPower->CreateShadowCircle(1.5f, 1.0f); //create a shadow for battary if ( power <= 1.0f ) modelManager->AddModelCopy("power.mod", false, rank); else modelManager->AddModelCopy("atomic.mod", false, rank); |