X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FTargetSelection.cpp;h=573200a799c1caf96e3819f47850e5eb67fd4a29;hb=HEAD;hp=42a88e4673b0444129fac3587564f090a578ee55;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index 42a88e4..573200a 100644
--- a/src/battle/TargetSelection.cpp
+++ b/src/battle/TargetSelection.cpp
@@ -1,18 +1,31 @@
 #include "TargetSelection.h"
 
-#include "BattleState.h"
+#include "Battle.h"
 #include "../common/TargetingMode.h"
 
+#include <cassert>
+
+
 namespace battle {
 
-TargetSelection::TargetSelection(BattleState *battle, bool multiple, bool atEnemy)
+TargetSelection::TargetSelection()
+: battle(0)
+, selected()
+, selection(-1)
+, cursor(0)
+, multiple(false)
+, enemy(true) {
+
+}
+
+TargetSelection::TargetSelection(Battle *battle, bool multiple, bool atEnemy)
 : battle(battle)
-, selected(battle ? (battle->MaxMonsters() > battle->NumHeroes() ? battle->MaxMonsters() : battle->NumHeroes()) : 0, State())
+, selected(battle->MaxMonsters() > battle->NumHeroes() ? battle->MaxMonsters() : battle->NumHeroes(), State())
 , selection(-1)
 , cursor(0)
 , multiple(multiple)
 , enemy(atEnemy) {
-	if (battle && enemy) {
+	if (enemy) {
 		FindNextEnemy();
 	}
 }
@@ -67,6 +80,7 @@ void TargetSelection::MoveUp() {
 }
 
 void TargetSelection::MoveRight() {
+	assert(battle);
 	if (TargetsMonsters()) {
 		cursor = (cursor + 1) % battle->MaxMonsters();
 		while (!battle->MonsterPositionOccupied(cursor)) {
@@ -78,6 +92,7 @@ void TargetSelection::MoveRight() {
 }
 
 void TargetSelection::MoveDown() {
+	assert(battle);
 	if (TargetsMonsters()) {
 		SelectHeroes();
 		return;
@@ -89,6 +104,7 @@ void TargetSelection::MoveDown() {
 }
 
 void TargetSelection::MoveLeft() {
+	assert(battle);
 	if (TargetsMonsters()) {
 		cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();
 		FindNextEnemy();
@@ -98,6 +114,7 @@ void TargetSelection::MoveLeft() {
 }
 
 void TargetSelection::FindNextEnemy() {
+	assert(battle);
 	int start(cursor);
 	while (!battle->MonsterPositionOccupied(cursor)) {
 		cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();