TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-21 21:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various cleanups and fixes

Browse source 
basicClouds refactored
null dereference fixes in guiMenuBar
This commit is contained in:
marauder2k7 2024-12-26 14:36:05 +00:00
parent eb746a1142
commit 4d980e5406
6 changed files with 104 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/fx/splash.cpp
View file

@ -183,6 +183,8 @@ void SplashData::packData(BitStream* stream)
stream->writeRangedU32(explosion->getId(), DataBlockObjectIdFirst, DataBlockObjectIdLast);
}
PACKDATA_ASSET_ARRAY_REFACTOR(Texture, NUM_TEX);
S32 i;
for( i=0; i<NUM_EMITTERS; i++ )
{
@ -201,8 +203,6 @@ void SplashData::packData(BitStream* stream)
{
stream->write( times[i] );
}
PACKDATA_ASSET_ARRAY_REFACTOR(Texture, NUM_TEX);
}
//--------------------------------------------------------------------------
@ -236,6 +236,8 @@ void SplashData::unpackData(BitStream* stream)
explosionId = stream->readRangedU32( DataBlockObjectIdFirst, DataBlockObjectIdLast );
}
UNPACKDATA_ASSET_ARRAY_REFACTOR(Texture, NUM_TEX);
U32 i;
for( i=0; i<NUM_EMITTERS; i++ )
{
@ -254,8 +256,6 @@ void SplashData::unpackData(BitStream* stream)
{
stream->read( &times[i] );
}
UNPACKDATA_ASSET_ARRAY_REFACTOR(Texture, NUM_TEX);
}
//--------------------------------------------------------------------------