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

Fix crash in normal race (RaceEventManager NULL).

Browse Source
This commit is contained in:
hiker 2016-12-16 23:26:34 +11:00
parent 77c14152c2
commit 5cde8f785f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items/item_manager.cpp
View File

@ -324,7 +324,7 @@ void ItemManager::checkItemHit(AbstractKart* kart)
if((*i)->hitKart(kart->getXYZ(), kart)) if((*i)->hitKart(kart->getXYZ(), kart))
{ {
// if we're not playing online, pick the item. // if we're not playing online, pick the item.
if (!RaceEventManager::getInstance()->isRunning()) if (!NetworkConfig::get()->isNetworking())
collectedItem(*i, kart); collectedItem(*i, kart);
else if (NetworkConfig::get()->isServer()) else if (NetworkConfig::get()->isServer())
{ {

5
src/karts/kart.cpp
View File

@ -67,7 +67,6 @@
#include "modes/soccer_world.hpp" #include "modes/soccer_world.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
#include "network/network_config.hpp" #include "network/network_config.hpp"
#include "network/race_event_manager.hpp"
#include "network/rewind_manager.hpp" #include "network/rewind_manager.hpp"
#include "physics/btKart.hpp" #include "physics/btKart.hpp"
#include "physics/btKartRaycast.hpp" #include "physics/btKartRaycast.hpp"
@ -1477,8 +1476,8 @@ void Kart::update(float dt)
// Check if any item was hit. // Check if any item was hit.
// check it if we're not in a network world, or if we're on the server // check it if we're not in a network world, or if we're on the server
// (when network mode is on) // (when network mode is on)
if (!RaceEventManager::getInstance()->isRunning() || if(!NetworkConfig::get()->isNetworking() ||
NetworkConfig::get()->isServer()) NetworkConfig::get()->isServer() )
ItemManager::get()->checkItemHit(this); ItemManager::get()->checkItemHit(this);
static video::SColor pink(255, 255, 133, 253); static video::SColor pink(255, 255, 133, 253);

3
src/main_loop.cpp
View File

@ -141,7 +141,8 @@ float MainLoop::getLimitedDt()
void MainLoop::updateRace(float dt) void MainLoop::updateRace(float dt)
{ {
// The race event manager will update world in case of an online race // The race event manager will update world in case of an online race
if (RaceEventManager::getInstance()->isRunning()) if ( RaceEventManager::getInstance() &&
RaceEventManager::getInstance()->isRunning() )
RaceEventManager::getInstance()->update(dt); RaceEventManager::getInstance()->update(dt);
else else
World::getWorld()->updateWorld(dt); World::getWorld()->updateWorld(dt);