Fix crash when using Nitro-Hack ( Fix #46 )

Author: Nomagno

data/kart_characteristics.xml

@@ -351,7 +351,7 @@ TEMPLATE
          <!-- Nitro-hack
             duration: Time a nitro-hack is active.
             factor: Multiplicative factor for the engine and max-speed boosts of nitro -->
-        <nitro-hack duration="7.0" factor="1.7" />
+        <nitrohack duration="7.0" factor="1.7" />
 
         <!-- Electro-Shield
             duration: Duration during which the electro-shield is active.

src/karts/abstract_characteristic.cpp

@@ -217,9 +217,9 @@ AbstractCharacteristic::ValueType AbstractCharacteristic::getType(
         return TYPE_FLOAT;
     case PLUNGER_IN_FACE_TIME:
         return TYPE_FLOAT;
-    case NITROHACK_DURATION:
+    case NITRO_HACK_DURATION:
         return TYPE_FLOAT;
-    case NITROHACK_FACTOR:
+    case NITRO_HACK_FACTOR:
         return TYPE_FLOAT;
     case ELECTRO_DURATION:
         return TYPE_FLOAT;
@@ -585,10 +585,10 @@ std::string AbstractCharacteristic::getName(CharacteristicType type)
         return "PLUNGER_BAND_FADE_OUT_TIME";
     case PLUNGER_IN_FACE_TIME:
         return "PLUNGER_IN_FACE_TIME";
-    case NITROHACK_DURATION:
-        return "NITROHACK_DURATION";
-    case NITROHACK_FACTOR:
-        return "NITROHACK_FACTOR";
+    case NITRO_HACK_DURATION:
+        return "NITRO_HACK_DURATION";
+    case NITRO_HACK_FACTOR:
+        return "NITRO_HACK_FACTOR";
     case ELECTRO_DURATION:
         return "ELECTRO_DURATION";
     case ELECTRO_ENGINE_MULT:
@@ -1756,28 +1756,28 @@ float AbstractCharacteristic::getPlungerInFaceTime() const
 }  // getPlungerInFaceTime
 
 // ----------------------------------------------------------------------------
-float AbstractCharacteristic::getNitrohackDuration() const
+float AbstractCharacteristic::getNitroHackDuration() const
 {
     float result;
     bool is_set = false;
-    process(NITROHACK_DURATION, &result, &is_set);
+    process(NITRO_HACK_DURATION, &result, &is_set);
     if (!is_set)
         Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
-                    getName(NITROHACK_DURATION).c_str());
+                    getName(NITRO_HACK_DURATION).c_str());
     return result;
-}  // getNitrohackDuration
+}  // getNitroHackDuration
 
 // ----------------------------------------------------------------------------
-float AbstractCharacteristic::getNitrohackFactor() const
+float AbstractCharacteristic::getNitroHackFactor() const
 {
     float result;
     bool is_set = false;
-    process(NITROHACK_FACTOR, &result, &is_set);
+    process(NITRO_HACK_FACTOR, &result, &is_set);
     if (!is_set)
         Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
-                    getName(NITROHACK_FACTOR).c_str());
+                    getName(NITRO_HACK_FACTOR).c_str());
     return result;
-}  // getNitrohackFactor
+}  // getNitroHackFactor
 
 // ----------------------------------------------------------------------------
 float AbstractCharacteristic::getElectroDuration() const

src/karts/abstract_characteristic.hpp

@@ -190,8 +190,8 @@ class AbstractCharacteristic
         PLUNGER_IN_FACE_TIME,
 
         // Nitrohack
-        NITROHACK_DURATION,
-        NITROHACK_FACTOR,
+        NITRO_HACK_DURATION,
+        NITRO_HACK_FACTOR,
 
         // Electro
         ELECTRO_DURATION,
@@ -436,8 +436,8 @@ class AbstractCharacteristic
     float getPlungerBandFadeOutTime() const;
     float getPlungerInFaceTime() const;
 
-    float getNitrohackDuration() const;
-    float getNitrohackFactor() const;
+    float getNitroHackDuration() const;
+    float getNitroHackFactor() const;
 
     float getElectroDuration() const;
     float getElectroEngineMult() const;

src/karts/kart.cpp

@@ -2750,8 +2750,8 @@ void Kart::addEnergy(float val, bool allow_negative = false)
 /** Called when the NitroHack powerup is used by the kart. **/
 void Kart::activateNitroHack()
 {
-    m_nitro_hack_ticks = STKConfig::get()->time2Ticks(m_kart_properties->getNitrohackDuration());
-    m_nitro_hack_factor = m_kart_properties->getNitrohackFactor();
+    m_nitro_hack_ticks = STKConfig::get()->time2Ticks(m_kart_properties->getNitroHackDuration());
+    m_nitro_hack_factor = m_kart_properties->getNitroHackFactor();
 }   // activateNitroHack
 
 //-----------------------------------------------------------------------------

src/karts/kart_properties.cpp

@@ -1242,16 +1242,16 @@ float KartProperties::getPlungerInFaceTime() const
 }  // getPlungerInFaceTime
 
 // ----------------------------------------------------------------------------
-float KartProperties::getNitrohackDuration() const
+float KartProperties::getNitroHackDuration() const
 {
-    return m_cached_characteristic->getNitrohackDuration();
-}  // getNitrohackDuration
+    return m_cached_characteristic->getNitroHackDuration();
+}  // getNitroHackDuration
 
 // ----------------------------------------------------------------------------
-float KartProperties::getNitrohackFactor() const
+float KartProperties::getNitroHackFactor() const
 {
-    return m_cached_characteristic->getNitrohackFactor();
-}  // getNitrohackFactor
+    return m_cached_characteristic->getNitroHackFactor();
+}  // getNitroHackFactor
 
 // ----------------------------------------------------------------------------
 float KartProperties::getElectroDuration() const

src/karts/kart_properties.hpp

@@ -483,8 +483,8 @@ class KartProperties
     float getPlungerBandFadeOutTime() const;
     float getPlungerInFaceTime() const;
 
-    float getNitrohackDuration() const;
-    float getNitrohackFactor() const;
+    float getNitroHackDuration() const;
+    float getNitroHackFactor() const;
 
     float getElectroDuration() const;
     float getElectroEngineMult() const;

src/karts/xml_characteristic.cpp

@@ -562,9 +562,9 @@ void XmlCharacteristic::load(const XMLNode *node)
     if (const XMLNode *sub_node = node->getNode("nitrohack"))
     {
         sub_node->get("duration",
-            &m_values[NITROHACK_DURATION]);
+            &m_values[NITRO_HACK_DURATION]);
         sub_node->get("factor",
-            &m_values[NITROHACK_FACTOR]);
+            &m_values[NITRO_HACK_FACTOR]);
     }
 
     if (const XMLNode *sub_node = node->getNode("electro"))

tools/create_kart_properties.py

@@ -45,7 +45,7 @@
 Zipper: duration, force, speedGain, maxSpeedIncrease, fadeOutTime
 Swatter: duration, distance, squashDuration, squashSlowdown
 Plunger: bandMaxLength, bandForce, bandDuration, bandSpeedIncrease, bandFadeOutTime, inFaceTime
-Nitrohack: duration, factor
+NitroHack: duration, factor
 Electro: duration, engineMult, maxSpeedIncrease, fadeOutTime
 Tyres: pitSpeedFraction, changeKartMap(std::string/string), namesLong(std::string/string), namesShort(std::string/string), maxLifeTurning(std::vector<float>/floatVector), maxLifeTraction(std::vector<float>/floatVector), minLifeTurning(std::vector<float>/floatVector), minLifeTraction(std::vector<float>/floatVector), regularTransferTurning(std::vector<float>/floatVector), regularTransferTraction(std::vector<float>/floatVector), limitingTransferTurning(std::vector<float>/floatVector), limitingTransferTraction(std::vector<float>/floatVector), initialBonusAddTurning(std::vector<float>/floatVector), initialBonusMultTurning(std::vector<float>/floatVector), initialBonusAddTraction(std::vector<float>/floatVector), initialBonusMultTraction(std::vector<float>/floatVector), initialBonusAddTopspeed(std::vector<float>/floatVector), initialBonusMultTopspeed(std::vector<float>/floatVector), responseCurveTurning(InterpolationArray), responseCurveTraction(InterpolationArray), responseCurveTopspeed(InterpolationArray), doGripBasedTurning(std::vector<float>/floatVector), doSubstractiveTurning(std::vector<float>/floatVector), doSubstractiveTraction(std::vector<float>/floatVector), doSubstractiveTopspeed(std::vector<float>/floatVector), tractionConstant(std::vector<float>/floatVector), turningConstant(std::vector<float>/floatVector), topspeedConstant(std::vector<float>/floatVector), compoundNumber, offroadFactor(std::vector<float>/floatVector), rollingResistance(std::vector<float>/floatVector), skidFactor(std::vector<float>/floatVector), brakeThreshold(std::vector<float>/floatVector), crashPenalty(std::vector<float>/floatVector), defaultColor(std::vector<float>/floatVector)
 Startup: time(std::vector<float>/floatVector), boost(std::vector<float>/floatVector), engineForce(std::vector<float>/floatVector), duration, fadeOutTime