Add m_type in init again, it disappeared in merge.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
d50bd9dbe6
commit
5b7a48217d
@ -54,6 +54,7 @@ Flyable::Flyable(Kart *kart, PowerupType type, float mass) : Moveable()
|
|||||||
m_average_height = (m_min_height+m_max_height)/2.0f;
|
m_average_height = (m_min_height+m_max_height)/2.0f;
|
||||||
m_force_updown = m_st_force_updown[type];
|
m_force_updown = m_st_force_updown[type];
|
||||||
m_owner = kart;
|
m_owner = kart;
|
||||||
|
m_type = type;
|
||||||
m_has_hit_something = false;
|
m_has_hit_something = false;
|
||||||
m_exploded = false;
|
m_exploded = false;
|
||||||
m_shape = NULL;
|
m_shape = NULL;
|
||||||
@ -366,6 +367,7 @@ void Flyable::hit(Kart *kart_hit, PhysicalObject* object)
|
|||||||
).c_str();
|
).c_str();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
printf("Failed message for %i\n", m_type);
|
||||||
assert(false);
|
assert(false);
|
||||||
}
|
}
|
||||||
gui->addMessage(hit_message, NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
|
gui->addMessage(hit_message, NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
|
||||||
|
Loading…
Reference in New Issue
Block a user