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

properties group node is not really necessary

Browse Source
This commit is contained in:
Bart Cools 2014-07-01 13:32:26 +02:00
parent 0fa6df587f
commit 41a5b5275b
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/stk_config.xml
View File

@ -145,8 +145,7 @@
<!-- Default values for all karts
============================ -->
<general-kart-defaults>
<properties group= "default" />
<!-- Camera: Distance between kart and camera.
forward-up-angle: Angle between camera and plane of kart (pitch)
when the camera is pointing forward
@ -416,12 +415,6 @@
<collision impulse-type="normal"
impulse="3000" impulse-time="0.1" terrain-impulse="8000"
restitution="1.0" bevel-factor="0.5 0.0 0.5" />
<!-- properties gropu
field that contains the properties group the kart belongs to
(light/medium/heavy). Those groups have specific kart
properties to have different karts -->
<properties group = "default"/>
<!-- If a kart starts within the specified time after 'go',
it receives the corresponding bonus from 'boost'. Those
@ -616,9 +609,7 @@
invulnerability-time="6" />
<kart-type>
<light>
<properties group = "light"/>
<light>
<startup time = "0.3 0.5"
boost = "8.5 4.5" />
@ -644,9 +635,7 @@
invulnerability-time="7" />
</light>
<medium>
<properties group = "medium"/>
<medium>
<startup time = "0.3 0.5"
boost = "4.2 2.6" />
@ -672,9 +661,7 @@
invulnerability-time="6" />
</medium>
<heavy>
<properties group = "heavy"/>
<heavy>
<startup time = "0.3 0.5"
boost = "3.8 2" />

8
src/karts/kart_properties.cpp
View File

@ -312,13 +312,7 @@ void KartProperties::getAllData(const XMLNode * root)
root->get("shadow-x-offset", &m_shadow_x_offset );
root->get("shadow-y-offset", &m_shadow_y_offset );
if(const XMLNode *props_group = root->getNode("properties")) {
props_group->get("group", &m_kart_type );
}
else
{
root->get("type", &m_kart_type );
}
root->get("type", &m_kart_type );
if(const XMLNode *dimensions_node = root->getNode("center"))
dimensions_node->get("gravity-shift", &m_gravity_center_shift);