From 416a05ec39b52ebe57b8f8d4bc252290575f933a Mon Sep 17 00:00:00 2001 From: samuncle Date: Sun, 23 Jun 2013 20:40:46 +0000 Subject: [PATCH] Improved nitro. Now we have a nice smoke :) git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12939 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/karts/kart.cpp | 7 +++++++ src/karts/kart_gfx.cpp | 2 ++ src/karts/kart_gfx.hpp | 2 ++ 3 files changed, 11 insertions(+) diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index 56f11cbb9..e73a2b6fa 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -2243,14 +2243,21 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz, if(f>1.0f) f = 1.0f; m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITRO1, f); m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITRO2, f); + m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITROSMOKE1, f); + m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITROSMOKE2, f); } else { m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITRO1, 0); m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITRO2, 0); + m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE1, 0); + m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE2, 0); + } m_kart_gfx->resizeBox(KartGFX::KGFX_NITRO1, getSpeed(), dt); m_kart_gfx->resizeBox(KartGFX::KGFX_NITRO2, getSpeed(), dt); + m_kart_gfx->resizeBox(KartGFX::KGFX_NITROSMOKE1, getSpeed(), dt); + m_kart_gfx->resizeBox(KartGFX::KGFX_NITROSMOKE2, getSpeed(), dt); m_kart_gfx->resizeBox(KartGFX::KGFX_ZIPPER, getSpeed(), dt); diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp index cf79e67ac..f4d5ac4a9 100644 --- a/src/karts/kart_gfx.cpp +++ b/src/karts/kart_gfx.cpp @@ -72,6 +72,8 @@ KartGFX::KartGFX(const AbstractKart *kart) // in the order of KartGFXType. addEffect(KGFX_NITRO1, "nitro.xml", rear_nitro_right); addEffect(KGFX_NITRO2, "nitro.xml", rear_nitro_left); + addEffect(KGFX_NITROSMOKE1, "nitro-smoke.xml", rear_nitro_left); + addEffect(KGFX_NITROSMOKE2, "nitro-smoke.xml", rear_nitro_right); addEffect(KGFX_ZIPPER, "zipper_fire.xml", rear_center); addEffect(KGFX_TERRAIN, "smoke.xml", Vec3(0,0,0)); addEffect(KGFX_SKID1L, "skid1.xml", rear_left); diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp index a2e80a3ea..24d178760 100644 --- a/src/karts/kart_gfx.hpp +++ b/src/karts/kart_gfx.hpp @@ -41,6 +41,8 @@ public: * is the number of entries and must therefore be last. */ enum KartGFXType { KGFX_NITRO1=0, KGFX_NITRO2, + KGFX_NITROSMOKE1, + KGFX_NITROSMOKE2, KGFX_ZIPPER, KGFX_TERRAIN, KGFX_SKIDL,