extracted battle logic into a class

[l2e.git] / src / battle / AttackChoice.h

diff --git a/src/battle/AttackChoice.h b/src/battle/AttackChoice.h
index 8cba2353a164bccfd155672dd9c9fc5df291aa0c..0049f1e2be198bd068713be96d26be3ddf124646 100644 (file)
--- a/src/battle/AttackChoice.h
+++ b/src/battle/AttackChoice.h
@@ -1,21 +1,16 @@
-/*
- * AttackChoice.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_ATTACKCHOICE_H_
 #define BATTLE_ATTACKCHOICE_H_
 
-#include "TargetSelection.h"
-
+namespace battle {
+       class Battle;
+}
 namespace common {
-       class Ikari;
        class Item;
        class Spell;
 }
 
+#include "TargetSelection.h"
+
 namespace battle {
 
 class AttackChoice {
@@ -31,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:
@@ -55,4 +53,4 @@ private:
 
 }
 
-#endif /* BATTLE_ATTACKCHOICE_H_ */
+#endif