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

new player explosion feature

Browse source
This commit is contained in:
Duion 2016-05-29 22:18:10 +02:00
parent ce847398d3
commit 308063a006
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/T3D/projectile.cpp
View file

@ -148,6 +148,8 @@ ProjectileData::ProjectileData()
waterExplosion = NULL; waterExplosion = NULL;
waterExplosionId = 0; waterExplosionId = 0;
playerExplosion = NULL;
playerExplosionId = 0;
//hasLight = false; //hasLight = false;
//lightRadius = 1; //lightRadius = 1;
@ -218,6 +220,8 @@ void ProjectileData::initPersistFields()
"@brief Explosion datablock used when the projectile explodes outside of water.\n\n"); "@brief Explosion datablock used when the projectile explodes outside of water.\n\n");
addField("waterExplosion", TYPEID< ExplosionData >(), Offset(waterExplosion, ProjectileData), addField("waterExplosion", TYPEID< ExplosionData >(), Offset(waterExplosion, ProjectileData),
"@brief Explosion datablock used when the projectile explodes underwater.\n\n"); "@brief Explosion datablock used when the projectile explodes underwater.\n\n");
addField("playerExplosion", TYPEID< ExplosionData >(), Offset(playerExplosion, ProjectileData),
"@brief Explosion datablock used when the projectile explodes on a player.\n\n");
addField("splash", TYPEID< SplashData >(), Offset(splash, ProjectileData), addField("splash", TYPEID< SplashData >(), Offset(splash, ProjectileData),
"@brief Splash datablock used to create splash effects as the projectile enters or leaves water\n\n"); "@brief Splash datablock used to create splash effects as the projectile enters or leaves water\n\n");
@ -311,6 +315,10 @@ bool ProjectileData::preload(bool server, String &errorStr)
if (!waterExplosion && waterExplosionId != 0) if (!waterExplosion && waterExplosionId != 0)
if (Sim::findObject(waterExplosionId, waterExplosion) == false) if (Sim::findObject(waterExplosionId, waterExplosion) == false)
Con::errorf(ConsoleLogEntry::General, "ProjectileData::preload: Invalid packet, bad datablockId(waterExplosion): %d", waterExplosionId); Con::errorf(ConsoleLogEntry::General, "ProjectileData::preload: Invalid packet, bad datablockId(waterExplosion): %d", waterExplosionId);
if (!playerExplosion && playerExplosionId != 0)
if (Sim::findObject(playerExplosionId, playerExplosion) == false)
Con::errorf(ConsoleLogEntry::General, "ProjectileData::preload: Invalid packet, bad datablockId(playerExplosion): %d", playerExplosionId);
if (!splash && splashId != 0) if (!splash && splashId != 0)
if (Sim::findObject(splashId, splash) == false) if (Sim::findObject(splashId, splash) == false)
@ -379,6 +387,10 @@ void ProjectileData::packData(BitStream* stream)
if (stream->writeFlag(waterExplosion != NULL)) if (stream->writeFlag(waterExplosion != NULL))
stream->writeRangedU32(waterExplosion->getId(), DataBlockObjectIdFirst, stream->writeRangedU32(waterExplosion->getId(), DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
if (stream->writeFlag(playerExplosion != NULL))
stream->writeRangedU32(playerExplosion->getId(), DataBlockObjectIdFirst,
DataBlockObjectIdLast);
if (stream->writeFlag(splash != NULL)) if (stream->writeFlag(splash != NULL))
stream->writeRangedU32(splash->getId(), DataBlockObjectIdFirst, stream->writeRangedU32(splash->getId(), DataBlockObjectIdFirst,
@ -442,6 +454,9 @@ void ProjectileData::unpackData(BitStream* stream)
if (stream->readFlag()) if (stream->readFlag())
waterExplosionId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); waterExplosionId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
if (stream->readFlag())
playerExplosionId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
if (stream->readFlag()) if (stream->readFlag())
splashId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); splashId = stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
@ -993,6 +1008,12 @@ void Projectile::explode( const Point3F &p, const Point3F &n, const U32 collideT
pExplosion = new Explosion; pExplosion = new Explosion;
pExplosion->onNewDataBlock(mDataBlock->waterExplosion, false); pExplosion->onNewDataBlock(mDataBlock->waterExplosion, false);
} }
else
if (mDataBlock->playerExplosion && (collideType & PlayerObjectType))
{
pExplosion = new Explosion;
pExplosion->onNewDataBlock(mDataBlock->playerExplosion, false);
}
else else
if (mDataBlock->explosion) if (mDataBlock->explosion)
{ {

2
Engine/source/T3D/projectile.h
View file

@ -103,6 +103,8 @@ public:
ExplosionData* waterExplosion; // Water Explosion Datablock ExplosionData* waterExplosion; // Water Explosion Datablock
S32 waterExplosionId; // Water Explosion ID S32 waterExplosionId; // Water Explosion ID
ExplosionData* playerExplosion; // Player Explosion Datablock
S32 playerExplosionId; // Player Explosion ID
SplashData* splash; // Water Splash Datablock SplashData* splash; // Water Splash Datablock
S32 splashId; // Water splash ID S32 splashId; // Water splash ID