X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FAttackChoice.h;h=42eb0d3c51c2b40bde00a98e788f34bfa7891169;hb=d955815b31c8c1b0beba87c2d9eb3b6ae1bebe93;hp=0068e6f67e50049c1e751c7da9240bf6c1a7a499;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git diff --git a/src/battle/AttackChoice.h b/src/battle/AttackChoice.h index 0068e6f..42eb0d3 100644 --- a/src/battle/AttackChoice.h +++ b/src/battle/AttackChoice.h @@ -10,6 +10,8 @@ #include "TargetSelection.h" +namespace common { class Item; } + namespace battle { class AttackChoice { @@ -25,18 +27,23 @@ public: }; public: - explicit AttackChoice(BattleState *b = 0) : type(UNDECIDED), selection(b) { } + explicit AttackChoice(BattleState *b = 0) : thing(0), selection(b), type(UNDECIDED) { } ~AttackChoice() { } public: Type GetType() const { return type; } void SetType(Type t) { type = t; } + const common::Item *GetItem() const { return (const common::Item *)thing; } + void SetItem(const common::Item *i) { thing = i; } TargetSelection &Selection() { return selection; } const TargetSelection &Selection() const { return selection; } + void Reset(); + private: - Type type; + const void *thing; TargetSelection selection; + Type type; };