Change previous commit, do it the old way, since travis still uses gcc 4.6

This commit is contained in:
Marianne Gagnon
2015-01-16 18:31:01 -05:00
parent c8bd922314
commit 0ba0b2fe23
2 changed files with 2 additions and 1 deletions

View File

@@ -441,6 +441,7 @@ void Material::init()
m_sfx_max_speed = 30;
m_sfx_min_pitch = 1.0f;
m_sfx_max_pitch = 1.0f;
m_sfx_pitch_per_speed = 0.0f;
m_zipper = false;
m_zipper_duration = -1.0f;
m_zipper_fade_out_time = -1.0f;

View File

@@ -202,7 +202,7 @@ private:
/** (max_pitch-min_pitch) / (max_speed - min_speed). Used to adjust
* the pitch of a sfx depending on speed of the kart.
*/
float m_sfx_pitch_per_speed = 0.0f;
float m_sfx_pitch_per_speed;
/** Additional speed allowed on top of the kart-specific maximum kart speed
* if a zipper is used. If this value is <0 the kart specific value will
* be used. */