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

Hopefully fixed crash: m_emitter was not initialised if a normal item

Browse Source 
does not have a parent (resulting in a crash in when testing if
the emitter() was "nolok").


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-09-06 05:43:32 +00:00
parent 775a346f19
commit 795bce6e67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/items/item.cpp
View File

@ -91,7 +91,6 @@ Item::Item(const Vec3& xyz, float distance, TriggerItemListener* trigger)
m_original_lowmesh = NULL;
m_node = NULL;
m_listener = trigger;
m_emitter = NULL;
} // Item(xyz, distance, trigger)
//-----------------------------------------------------------------------------
@ -109,6 +108,7 @@ void Item::initItem(ItemType type, const Vec3 &xyz)
m_original_type = ITEM_NONE;
m_deactive_time = 0;
m_time_till_return = 0.0f; // not strictly necessary, see isCollected()
m_emitter = NULL;
m_rotate = (type!=ITEM_BUBBLEGUM) && (type!=ITEM_TRIGGER);
m_disappear_counter = m_type==ITEM_BUBBLEGUM
? stk_config->m_bubble_gum_counter
@ -254,7 +254,7 @@ void Item::reset()
void Item::setParent(AbstractKart* parent)
{
m_event_handler = parent;
m_emitter = parent;
m_emitter = parent;
m_deactive_time = 1.5f;
} // setParent