mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #758 from Azaezel/alpha40/spawnDisplayAug
display the item to be spawned
This commit is contained in:
commit
67b5afcfbe
|
|
@ -433,7 +433,23 @@ void SpawnSphere::unpackUpdate(NetConnection * con, BitStream * stream)
|
||||||
mSpawnTransform = stream->readFlag();
|
mSpawnTransform = stream->readFlag();
|
||||||
|
|
||||||
stream->read(&mSpawnClass);
|
stream->read(&mSpawnClass);
|
||||||
|
|
||||||
|
String oldSDB = mSpawnDataBlock;
|
||||||
stream->read(&mSpawnDataBlock);
|
stream->read(&mSpawnDataBlock);
|
||||||
|
if (oldSDB != mSpawnDataBlock)
|
||||||
|
{
|
||||||
|
delete mShapeInstance;
|
||||||
|
ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
|
||||||
|
if (spawnedDatablock && spawnedDatablock->mShape)
|
||||||
|
{
|
||||||
|
mShapeInstance = new TSShapeInstance(spawnedDatablock->mShape);
|
||||||
|
}
|
||||||
|
else if (mDataBlock)
|
||||||
|
{
|
||||||
|
if (mDataBlock->mShape)
|
||||||
|
mShapeInstance = new TSShapeInstance(mDataBlock->mShape);
|
||||||
|
}
|
||||||
|
}
|
||||||
stream->read(&mSpawnName);
|
stream->read(&mSpawnName);
|
||||||
stream->read(&mSpawnProperties);
|
stream->read(&mSpawnProperties);
|
||||||
stream->read(&mSpawnScript);
|
stream->read(&mSpawnScript);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue