Heiltrank und Heilzauber: Heilt keine temporären Kämpfer (Wölfe)

eressea · Jun 10, 2024 · a325fa2 · a325fa2
1 parent b4d7ace
commit a325fa2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/battle.c b/src/battle.c
@@ -1107,12 +1107,16 @@ static bool resurrect_troop(troop dt)
 {
     fighter *df = dt.fighter;
     unit *du = df->unit;
-    if (oldpotiontype[P_HEAL] && !fval(&df->person[dt.index], FL_HEALING_USED)) {
-        if (i_get(du->items, oldpotiontype[P_HEAL]) > 0) {
-            fset(&df->person[dt.index], FL_HEALING_USED);
-            i_change(&du->items, oldpotiontype[P_HEAL], -1);
-            df->person[dt.index].hp = u_race(du)->hitpoints * 5; /* give the person a buffer */
-            return true;
+
+    /* do not heal temporary fighters */
+    if (!a_find(du->attribs, &at_unitdissolve)) {
+        if (oldpotiontype[P_HEAL] && !fval(&df->person[dt.index], FL_HEALING_USED)) {
+            if (i_get(du->items, oldpotiontype[P_HEAL]) > 0) {
+                fset(&df->person[dt.index], FL_HEALING_USED);
+                i_change(&du->items, oldpotiontype[P_HEAL], -1);
+                df->person[dt.index].hp = u_race(du)->hitpoints * 5; /* give the person a buffer */
+                return true;
+            }
         }
     }
     return false;

diff --git a/src/spells/combatspells.c b/src/spells/combatspells.c
@@ -1392,10 +1392,14 @@ static int heal_fighters(selist * fgs, int *power, bool heal_monsters)
 
     for (qi = 0, ql = fgs; ql; selist_advance(&ql, &qi, 1)) {
         fighter *df = (fighter *)selist_get(ql, qi);
-
         if (healhp <= 0)
             break;
 
+        /* do not heal temporary fighters */
+        if (a_find(df->unit->attribs, &at_unitdissolve)) {
+            continue;
+        }
+
         /* Untote kann man nicht heilen */
         if (df->unit->number == 0 || (u_race(df->unit)->flags & RCF_NOHEAL))
             continue;