TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 10:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for join server with bots crash

Browse source
This commit is contained in:
Duion 2016-12-23 16:24:29 +01:00
parent 2bbc07ebf1
commit 75b7348cd6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/shapeImage.cpp
View file

@ -3377,10 +3377,10 @@ void ShapeBase::shakeCamera( U32 imageSlot )
// first check if explosion is near camera
GameConnection* connection = GameConnection::getConnectionToServer();
ShapeBase *obj = dynamic_cast<ShapeBase*>(connection->getControlObject());
bool applyShake = true;
if (obj)
if (obj && !mIsAiControlled)
{
ShapeBase* cObj = obj;
while ((cObj = cObj->getControlObject()) != 0)
@ -3393,7 +3393,7 @@ void ShapeBase::shakeCamera( U32 imageSlot )
}
}
if (applyShake && obj)
if (applyShake && obj && !mIsAiControlled)
{
VectorF diff;
getMuzzlePoint(imageSlot, &diff);