X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FAttackChoice.h;h=0049f1e2be198bd068713be96d26be3ddf124646;hb=63a2a96b70a18d08a2714571f79fe7d99612cb9e;hp=d332b267f70a6facf473ad1d47bbc516e8071d7b;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git

diff --git a/src/battle/AttackChoice.h b/src/battle/AttackChoice.h
index d332b26..0049f1e 100644
--- a/src/battle/AttackChoice.h
+++ b/src/battle/AttackChoice.h
@@ -1,15 +1,15 @@
-/*
- * AttackChoice.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_ATTACKCHOICE_H_
 #define BATTLE_ATTACKCHOICE_H_
 
+namespace battle {
+	class Battle;
+}
+namespace common {
+	class Item;
+	class Spell;
+}
+
 #include "TargetSelection.h"
-#include "../common/fwd.h"
 
 namespace battle {
 
@@ -26,7 +26,10 @@ public:
 	};
 
 public:
-	explicit AttackChoice(BattleState *b = 0) : thing(0), selection(b), type(UNDECIDED) { }
+	AttackChoice()
+	: thing(0), selection(), type(UNDECIDED) { }
+	explicit AttackChoice(Battle *b)
+	: thing(0), selection(b), type(UNDECIDED) { }
 	~AttackChoice() { }
 
 public:
@@ -50,4 +53,4 @@ private:
 
 }
 
-#endif /* BATTLE_ATTACKCHOICE_H_ */
+#endif