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

Merge pull request #919 from lukaspj/Network-BaseTexFormat-Fix

Browse source 
BaseTexFormat was not networked properly.
This commit is contained in:
Daniel Buckmaster 2014-11-26 10:30:20 +11:00
commit c08413ffde
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/terrain/terrData.cpp
View file

@ -1199,6 +1199,8 @@ U32 TerrainBlock::packUpdate(NetConnection* con, U32 mask, BitStream *stream)
if ( stream->writeFlag( mask & MiscMask ) ) if ( stream->writeFlag( mask & MiscMask ) )
stream->write( mScreenError ); stream->write( mScreenError );
stream->writeInt(mBaseTexFormat, 32);
return retMask; return retMask;
} }
@ -1265,6 +1267,8 @@ void TerrainBlock::unpackUpdate(NetConnection* con, BitStream *stream)
if ( stream->readFlag() ) // MiscMask if ( stream->readFlag() ) // MiscMask
stream->read( &mScreenError ); stream->read( &mScreenError );
mBaseTexFormat = (BaseTexFormat)stream->readInt(32);
} }
void TerrainBlock::getMinMaxHeight( F32 *minHeight, F32 *maxHeight ) const void TerrainBlock::getMinMaxHeight( F32 *minHeight, F32 *maxHeight ) const