TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a setControllingClient method to vehicles referencing the shapebase class direct.

Browse source 
fix shapebase::setControllingClient swap getControllingObject() test
This commit is contained in:
AzaezelX 2022-12-25 14:48:10 -06:00
parent 54a2235128
commit d960f941e1
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/shapeBase.cpp
View file

@ -1572,7 +1572,7 @@ void ShapeBase::setControllingClient( GameConnection* client )
gSFX3DWorld->setListener( NULL ); gSFX3DWorld->setListener( NULL );
} }
else if( client && client->isConnectionToServer() && !getControllingObject() ) else if( client && client->isConnectionToServer() && (getControllingObject() != this) )
{ {
// We're on the local client and not controlled by another object, so make // We're on the local client and not controlled by another object, so make
// us the current SFX listener. // us the current SFX listener.

4
Engine/source/T3D/vehicles/vehicle.cpp
View file

@ -1376,6 +1376,10 @@ void Vehicle::unpackUpdate(NetConnection *con, BitStream *stream)
setEnergyLevel(stream->readFloat(8) * mDataBlock->maxEnergy); setEnergyLevel(stream->readFloat(8) * mDataBlock->maxEnergy);
} }
void Vehicle::setControllingClient(GameConnection* client)
{
ShapeBase::setControllingClient(client);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

1
Engine/source/T3D/vehicles/vehicle.h
View file

@ -171,6 +171,7 @@ class Vehicle : public RigidShape
void readPacketData (GameConnection * conn, BitStream *stream); void readPacketData (GameConnection * conn, BitStream *stream);
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream); U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream); void unpackUpdate(NetConnection *conn, BitStream *stream);
void setControllingClient(GameConnection* connection);
void updateLiftoffDust( F32 dt ); void updateLiftoffDust( F32 dt );
void updateDamageSmoke( F32 dt ); void updateDamageSmoke( F32 dt );