ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused explosion-impulse property.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2011-06-04 13:21:06 +00:00
parent d56a729041
commit 8d2ac03837
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/stk_config.xml
View File

@@ -93,10 +93,9 @@
<!-- How often bubble gum get driven over before it disappears. -->
<bubble-gum disappear-counter="1"/>
<!-- impulse is the push from explosions when karts aren't hit directly.
explosion-impulse-objects is the impulse for physics objects (smaller
ones like the cone, will be pushed way too far with normal impulse). -->
<explosion impulse="10000.0" impulse-objects="500.0" />
<!-- explosion-impulse-objects is the impulse that pushes physical objects
away if there is an explosion. -->
<explosion impulse-objects="500.0" />
<!-- Networking - the current networking code is outdated and will not
work anymore - so for now don't enable this. -->

5
src/config/stk_config.cpp
View File

@@ -113,7 +113,6 @@ void STKConfig::load(const std::string &filename)
CHECK_NEG(m_anvil_weight, "anvil-weight" );
CHECK_NEG(m_item_switch_time, "item-switch-time" );
CHECK_NEG(m_bubble_gum_counter, "bubblegum disappear counter");
CHECK_NEG(m_explosion_impulse, "explosion-impulse" );
CHECK_NEG(m_explosion_impulse_objects, "explosion-impulse-objects" );
CHECK_NEG(m_max_history, "max-history" );
CHECK_NEG(m_max_skidmarks, "max-skidmarks" );
@@ -144,10 +143,9 @@ void STKConfig::init_defaults()
m_parachute_time_other = m_anvil_speed_factor =
m_bomb_time = m_bomb_time_increase =
m_anvil_time = m_music_credit_time =
m_explosion_impulse = m_explosion_impulse_objects =
m_delay_finish_time = m_skid_fadeout_time =
m_near_ground = m_item_switch_time =
m_penalty_time = UNDEFINED;
m_penalty_time = m_explosion_impulse_objects = UNDEFINED;
m_bubble_gum_counter = -100;
m_max_karts = -100;
m_gp_order = -100;
@@ -326,7 +324,6 @@ void STKConfig::getAllData(const XMLNode * root)
if(const XMLNode *explosion_node= root->getNode("explosion"))
{
explosion_node->get("impulse", &m_explosion_impulse );
explosion_node->get("impulse-objects", &m_explosion_impulse_objects);
}

1
src/config/stk_config.hpp
View File

@@ -69,7 +69,6 @@ public:
float m_item_switch_time; /**< Time items will be switched. */
int m_bubble_gum_counter; /**< How many times bananas must be eaten
before they disappear. */
float m_explosion_impulse; /**<Impulse affecting each non-hit kart.*/
float m_explosion_impulse_objects;/**<Impulse of explosion on moving
objects, e.g. road cones, ... */
float m_penalty_time; /**< Penalty time when starting too