http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000083

- untote helden wwurden nicht aus total vernichteten einheiten genommen

src/common/kernel/battle.c

@@ -1411,8 +1411,6 @@ fighters(battle *b, fighter *af, int minrow, int maxrow, int mask)
   cv_init(fightervp);
 
   cv_foreach(fig, b->fighters) {
-		if (!fig->alive) continue;
-
     row = get_unitrow(fig);
     if (row >= minrow && row <= maxrow) {
       switch (mask) {

src/common/kernel/combatspells.c

@@ -306,8 +306,9 @@ sp_combatrosthauch(fighter * fi, int level, double power, spell * sp)
 
 	for (fig = fgs->begin; fig != fgs->end; ++fig) {
 		fighter *df = *fig;
-		if (!force)
-			break;
+
+                if (df->alive==0) continue;
+                if (force<=0) break;
 
 		/* da n min(force, x), sollte force maximal auf 0 sinken */
 		assert(force >= 0);
@@ -934,6 +935,7 @@ sp_chaosrow(fighter * fi, int level, double power, spell * sp)
     fighter *df = *fig;
     int n = df->unit->number;
   
+    if (df->alive==0) continue;
     if (power<=0.0) break;
     /* force sollte wegen des max(0,x) nicht unter 0 fallen können */
 
@@ -1029,7 +1031,7 @@ sp_flee(fighter * fi, int level, double power, spell * sp)
 
 	for (fig = fgs->begin; fig != fgs->end; ++fig) {
 		fighter *df = *fig;
-		for (n = 0; n < df->alive; n++) {
+		for (n=0; n!=df->alive; ++n) {
 			if (force < 0)
 				break;
 
@@ -1665,8 +1667,7 @@ sp_healing(fighter * fi, int level, double power, spell * sp)
   for (fig = fgs->begin; fig != fgs->end; ++fig) {
     fighter *df = *fig;
 
-		if (!healhp)
-			break;
+    if (healhp<=0) break;
 
     /* Untote kann man nicht heilen */
     if (fval(df->unit->race, RCF_NOHEAL))
@@ -1674,8 +1675,8 @@ sp_healing(fighter * fi, int level, double power, spell * sp)
 
     hp = unit_max_hp(df->unit);
     for (n = 0; n < df->unit->number; n++) {
-			if (!healhp)
-				break;
+      if (healhp<=0) break;
+
       wound = hp - df->person[n].hp;
       if ( wound > 0 && wound < hp) {
         int heal = min(healhp, wound);