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

code duplication prune. should aid in stability

Browse source
This commit is contained in:
AzaezelX 2021-10-03 02:56:26 -05:00
parent 10f2453cee
commit 98a079a797
123 changed files with 632 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,8 +82,8 @@ ProximityMineData::ProximityMineData()
triggerSequence( -1 ),
explosionOffset( 0.05f )
{
INIT_SOUNDASSET(ArmSound);
INIT_SOUNDASSET(TriggerSound);
INIT_ASSET(ArmSound);
INIT_ASSET(TriggerSound);
}
void ProximityMineData::initPersistFields()
@ -156,14 +156,14 @@ void ProximityMineData::packData( BitStream* stream )
Parent::packData( stream );
stream->write( armingDelay );
PACKDATA_SOUNDASSET(ArmSound);
PACKDATA_ASSET(ArmSound);
stream->write( autoTriggerDelay );
stream->writeFlag( triggerOnOwner );
stream->write( triggerRadius );
stream->write( triggerSpeed );
stream->write( triggerDelay );
PACKDATA_SOUNDASSET(TriggerSound);
PACKDATA_ASSET(TriggerSound);
}
void ProximityMineData::unpackData( BitStream* stream )
@ -171,14 +171,14 @@ void ProximityMineData::unpackData( BitStream* stream )
Parent::unpackData(stream);
stream->read( &armingDelay );
UNPACKDATA_SOUNDASSET(ArmSound);
UNPACKDATA_ASSET(ArmSound);
stream->read( &autoTriggerDelay );
triggerOnOwner = stream->readFlag();
stream->read( &triggerRadius );
stream->read( &triggerSpeed );
stream->read( &triggerDelay );
UNPACKDATA_SOUNDASSET(TriggerSound);
UNPACKDATA_ASSET(TriggerSound);
}
//----------------------------------------------------------------------------