From 00f879600bcea8f1ec1775c941041ee6346a60ba Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Tue, 28 Mar 2017 11:21:33 -0400 Subject: skirl can kill --- include/attack.hpp | 5 +++-- include/components.hpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/attack.hpp b/include/attack.hpp index ef67a79..0ab5138 100644 --- a/include/attack.hpp +++ b/include/attack.hpp @@ -13,11 +13,12 @@ enum class AttackType : char { }; struct AttackEvent { - AttackEvent(vec2 p, AttackType at, int pow = 10) - : pos(p), type(at), power(pow) {} + AttackEvent(vec2 p, AttackType at, bool fp, int pow = 10) + : pos(p), type(at), fromplayer(fp), power(pow) {} vec2 pos; AttackType type; + bool fromplayer; int power; }; diff --git a/include/components.hpp b/include/components.hpp index 20a1419..dafb859 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -611,10 +611,11 @@ struct Aggro : public Component { }; struct Hit : public Component { - Hit(int d) - : damage(d) {} + Hit(int d, bool p = false) + : damage(d), pierce(p) {} int damage; + bool pierce; void fromXML(XMLElement* imp, XMLElement* def) final { (void)imp; -- cgit v1.2.3