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

Check for possible null m_confirmed_state

Browse Source
This commit is contained in:
Benau 2018-09-22 00:54:37 +08:00
parent b1a535b21f
commit 553747237e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/items/network_item_manager.cpp
View File

@ -319,11 +319,14 @@ void NetworkItemManager::restoreState(BareNetworkString *buffer, int count)
// otherwise resulting in stuttering). // otherwise resulting in stuttering).
int old_time = world->getTicksSinceStart(); // Save time we rewind to int old_time = world->getTicksSinceStart(); // Save time we rewind to
world->setTicksForRewind(iei.getTicks()); // Set time of event world->setTicksForRewind(iei.getTicks()); // Set time of event
collectedItem(m_confirmed_state[index], kart);// Collect item
// Reset till ticks return from state (required for eating banana with bomb) if (m_confirmed_state[index] != NULL)
int ttr = iei.getTicksTillReturn(); {
m_confirmed_state[index]->setTicksTillReturn(ttr); m_confirmed_state[index]->collected(kart);// Collect item
// Reset till ticks return from state (required for eating banana with bomb)
int ttr = iei.getTicksTillReturn();
m_confirmed_state[index]->setTicksTillReturn(ttr);
}
world->setTicksForRewind(old_time); // Set time to rewind-to world->setTicksForRewind(old_time); // Set time to rewind-to