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

Fix crash for deve's soccer arena without navmesh

Browse Source
This commit is contained in:
Benau 2018-10-05 00:58:46 +08:00
parent fedf93c928
commit 1bb0be6a8c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modes/soccer_world.cpp
View File

@ -213,11 +213,11 @@ const std::string& SoccerWorld::getIdent() const
void SoccerWorld::update(int ticks) void SoccerWorld::update(int ticks)
{ {
updateBallPosition(ticks); updateBallPosition(ticks);
updateSectorForKarts(); if (Track::getCurrentTrack()->hasNavMesh())
if (Track::getCurrentTrack()->hasNavMesh() &&
!NetworkConfig::get()->isNetworking())
{ {
updateAIData(); updateSectorForKarts();
if (!NetworkConfig::get()->isNetworking())
updateAIData();
} }
WorldWithRank::update(ticks); WorldWithRank::update(ticks);
@ -652,6 +652,9 @@ int SoccerWorld::getAttacker(KartTeam team) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int SoccerWorld::getRescuePositionIndex(AbstractKart *kart) unsigned int SoccerWorld::getRescuePositionIndex(AbstractKart *kart)
{ {
if (!Track::getCurrentTrack()->hasNavMesh())
return m_kart_position_map.at(kart->getWorldKartId());
int last_valid_node = int last_valid_node =
getTrackSector(kart->getWorldKartId())->getLastValidGraphNode(); getTrackSector(kart->getWorldKartId())->getLastValidGraphNode();
if (last_valid_node >= 0) if (last_valid_node >= 0)
@ -663,6 +666,9 @@ unsigned int SoccerWorld::getRescuePositionIndex(AbstractKart *kart)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
btTransform SoccerWorld::getRescueTransform(unsigned int rescue_pos) const btTransform SoccerWorld::getRescueTransform(unsigned int rescue_pos) const
{ {
if (!Track::getCurrentTrack()->hasNavMesh())
return WorldWithRank::getRescueTransform(rescue_pos);
const Vec3 &xyz = Graph::get()->getQuad(rescue_pos)->getCenter(); const Vec3 &xyz = Graph::get()->getQuad(rescue_pos)->getCenter();
const Vec3 &normal = Graph::get()->getQuad(rescue_pos)->getNormal(); const Vec3 &normal = Graph::get()->getQuad(rescue_pos)->getNormal();
btTransform pos; btTransform pos;