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

Merge pull request #1809 from dud3/patch-1

Browse source 
refactor: spacing on function call parameters
This commit is contained in:
Areloch 2016-10-17 23:52:08 -05:00 • committed by GitHub
commit 5349bad5ca
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/staticShape.cpp
View file

@ -251,14 +251,14 @@ void StaticShape::onUnmount(ShapeBase*,S32)
U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstream) U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstream)
{ {
U32 retMask = Parent::packUpdate(connection,mask,bstream); U32 retMask = Parent::packUpdate(connection, mask, bstream);
if (bstream->writeFlag(mask & PositionMask | ExtendedInfoMask)) if (bstream->writeFlag(mask & PositionMask | ExtendedInfoMask))
{ {
// Write the transform (do _not_ use writeAffineTransform. Since this is a static // Write the transform (do _not_ use writeAffineTransform. Since this is a static
// object, the transform must be RIGHT THE *&)*$&^ ON or it will goof up the // object, the transform must be RIGHT THE *&)*$&^ ON or it will goof up the
// synchronization between the client and the server. // synchronization between the client and the server.
mathWrite(*bstream,mObjToWorld); mathWrite(*bstream, mObjToWorld);
mathWrite(*bstream, mObjScale); mathWrite(*bstream, mObjScale);
} }
@ -275,11 +275,11 @@ U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstr
void StaticShape::unpackUpdate(NetConnection *connection, BitStream *bstream) void StaticShape::unpackUpdate(NetConnection *connection, BitStream *bstream)
{ {
Parent::unpackUpdate(connection,bstream); Parent::unpackUpdate(connection, bstream);
if (bstream->readFlag()) if (bstream->readFlag())
{ {
MatrixF mat; MatrixF mat;
mathRead(*bstream,&mat); mathRead(*bstream, &mat);
Parent::setTransform(mat); Parent::setTransform(mat);
Parent::setRenderTransform(mat); Parent::setRenderTransform(mat);
@ -302,7 +302,7 @@ void StaticShape::unpackUpdate(NetConnection *connection, BitStream *bstream)
// This appears to be legacy T2 stuff // This appears to be legacy T2 stuff
// Marked internal, as this is flagged to be deleted // Marked internal, as this is flagged to be deleted
// [8/1/2010 mperry] // [8/1/2010 mperry]
DefineConsoleMethod( StaticShape, setPoweredState, void, (bool isPowered), , "(bool isPowered)" DefineConsoleMethod(StaticShape, setPoweredState, void, (bool isPowered), , "(bool isPowered)"
"@internal") "@internal")
{ {
if(!object->isServerObject()) if(!object->isServerObject())
@ -310,7 +310,7 @@ DefineConsoleMethod( StaticShape, setPoweredState, void, (bool isPowered), , "(b
object->setPowered(isPowered); object->setPowered(isPowered);
} }
DefineConsoleMethod( StaticShape, getPoweredState, bool, (), , "@internal") DefineConsoleMethod(StaticShape, getPoweredState, bool, (), , "@internal")
{ {
if(!object->isServerObject()) if(!object->isServerObject())
return(false); return(false);