Merge pull request #2092 from Azaezel/AIAimpoint

adds fallbacks to the aiTurret's scannode to operate similar to the aimNode
This commit is contained in:
Areloch 2018-04-30 23:40:15 -05:00 committed by GitHub
commit 18edce6b2e

View file

@ -249,14 +249,11 @@ bool AITurretShapeData::preload(bool server, String &errorStr)
// We have mShape at this point. Resolve nodes. // We have mShape at this point. Resolve nodes.
scanNode = mShape->findNode("scanPoint"); scanNode = mShape->findNode("scanPoint");
aimNode = mShape->findNode("aimPoint"); aimNode = mShape->findNode("aimPoint");
if (aimNode == -1)
{ if (scanNode == -1) scanNode = pitchNode;
aimNode = pitchNode; if (scanNode == -1) scanNode = headingNode;
} if (aimNode == -1) aimNode = pitchNode;
if (aimNode == -1) if (aimNode == -1) aimNode = headingNode;
{
aimNode = headingNode;
}
// Resolve state sequence names & emitter nodes // Resolve state sequence names & emitter nodes
isAnimated = false; isAnimated = false;