[Supertuxkart-commit] SF.net SVN: supertuxkart:[13338] main/trunk/src

[<au...@us...>]

Revision: 13338
          http://sourceforge.net/p/supertuxkart/code/13338
Author:   auria
Date:     2013-07-24 23:14:22 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Apply parts of patch by Deveee to better indicate new nitro consumption rules, with additions by myself for the race GUI

Modified Paths:
--------------
    main/trunk/src/karts/abstract_kart.hpp
    main/trunk/src/karts/kart.cpp
    main/trunk/src/karts/kart.hpp
    main/trunk/src/states_screens/race_gui.cpp

Modified: main/trunk/src/karts/abstract_kart.hpp
===================================================================
--- main/trunk/src/karts/abstract_kart.hpp	2013-07-24 15:43:54 UTC (rev 13337)
+++ main/trunk/src/karts/abstract_kart.hpp	2013-07-24 23:14:22 UTC (rev 13338)
@@ -317,6 +317,11 @@
     // ------------------------------------------------------------------------
     virtual void setEnergy(float val) = 0;
     // ------------------------------------------------------------------------
+    /** Return whether nitro is being used despite the nitro button not being
+     *  pressed due to minimal use time requirements
+     */
+    virtual float isOnMinNitroTime() const = 0;
+    // ------------------------------------------------------------------------
     /** Returns the current material the kart is on. */
     virtual const Material *getMaterial() const = 0;
     // ------------------------------------------------------------------------

Modified: main/trunk/src/karts/kart.cpp
===================================================================
--- main/trunk/src/karts/kart.cpp	2013-07-24 15:43:54 UTC (rev 13337)
+++ main/trunk/src/karts/kart.cpp	2013-07-24 23:14:22 UTC (rev 13338)
@@ -2302,7 +2302,7 @@
     y += m_skidding->getGraphicalJumpOffset();
     center_shift.setY(y);
 
-    if (m_controls.m_nitro && isOnGround() &&  m_collected_energy > 0)
+    if ((m_controls.m_nitro || m_min_nitro_time > 0.0f) && isOnGround() &&  m_collected_energy > 0)
     {
         // fabs(speed) is important, otherwise the negative number will
         // become a huge unsigned number in the particle scene node!

Modified: main/trunk/src/karts/kart.hpp
===================================================================
--- main/trunk/src/karts/kart.hpp	2013-07-24 15:43:54 UTC (rev 13337)
+++ main/trunk/src/karts/kart.hpp	2013-07-24 23:14:22 UTC (rev 13338)
@@ -403,6 +403,11 @@
     /** Sets the energy the kart has collected. */
     virtual void   setEnergy(float val) { m_collected_energy = val; }
     // ------------------------------------------------------------------------
+    /** Return whether nitro is being used despite the nitro button not being
+     *  pressed due to minimal use time requirements
+     */
+    virtual float isOnMinNitroTime() const { return m_min_nitro_time > 0.0f; }
+    // ------------------------------------------------------------------------
     /** Returns if the kart is currently being squashed. */
     virtual bool   isSquashed() const { return m_squash_time >0; }
     // ------------------------------------------------------------------------

Modified: main/trunk/src/states_screens/race_gui.cpp
===================================================================
--- main/trunk/src/states_screens/race_gui.cpp	2013-07-24 15:43:54 UTC (rev 13337)
+++ main/trunk/src/states_screens/race_gui.cpp	2013-07-24 23:14:22 UTC (rev 13338)
@@ -526,7 +526,7 @@
 
 
         video::SMaterial m;
-        if(kart->getControls().m_nitro)
+        if(kart->getControls().m_nitro || kart->isOnMinNitroTime())
             m.setTexture(0, m_gauge_full_bright);
         else
             m.setTexture(0, m_gauge_full);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.