mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Add new setting for shots: DieOnKill (default: off)

Browse source
This commit is contained in:
fgenesis 2014-03-08 02:17:55 +01:00
parent b95dfee4c6
commit 04ce34afa2
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Aquaria/Shot.cpp
View file

@ -59,6 +59,7 @@ ShotData::ShotData()
homingMax = 0; homingMax = 0;
homingIncr = 0; homingIncr = 0;
dieOnHit = 1; dieOnHit = 1;
dieOnKill = false;
hitEnts = 1; hitEnts = 1;
wallHitRadius = 0; wallHitRadius = 0;
rotateToVel = 1; rotateToVel = 1;
@ -241,6 +242,8 @@ void ShotData::bankLoad(const std::string &file, const std::string &path)
inf >> dieOnHit; inf >> dieOnHit;
else if (token == "IgnoreShield") else if (token == "IgnoreShield")
inf >> ignoreShield; inf >> ignoreShield;
else if (token == "DieOnKill")
inf >> dieOnKill;
else else
{ {
// if having weirdness, check for these // if having weirdness, check for these
@ -595,7 +598,7 @@ void Shot::hitEntity(Entity *e, Bone *b, bool isValid)
if (e->isEntityDead()) if (e->isEntityDead())
{ {
die = false; die = shotData ? shotData->dieOnKill : false;
} }
if (firer) if (firer)

1
Aquaria/Shot.h
View file

@ -43,6 +43,7 @@ struct ShotData
Vector scale; Vector scale;
bool ignoreShield; bool ignoreShield;
bool dieOnKill;
float effectTime; float effectTime;