From 0573ddfbab6e5b44c100c6745fd38782df9f4a5f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 18 Mar 2021 21:02:22 +0100
Subject: [PATCH] https://bugs.eressea.de/view.php?id=2732 fix permanent smurfs

---
 src/items.c       | 27 ++++++++++++---------------
 src/kernel/save.c | 14 +++++++++++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/items.c b/src/items.c
index 7912ff350..27185c0b4 100644
--- a/src/items.c
+++ b/src/items.c
@@ -287,22 +287,19 @@ struct order *ord)
         change_effect(u, itype, 100 * amount);
     }
     else {
-        const race *irace = u_irace(u);
-        if (irace == u_race(u)) {
-            const race *rcfailure = rc_find("smurf");
-            if (!rcfailure) {
-                rcfailure = rc_find("toad");
-            }
-            if (rcfailure) {
-                trigger *trestore = trigger_changerace(u, u_race(u), irace);
-                if (trestore) {
-                    int duration = 2 + rng_int() % 8;
+        const race *rcfailure = rc_find("smurf");
+        if (!rcfailure) {
+            rcfailure = rc_find("toad");
+        }
+        if (rcfailure) {
+            trigger *trestore = trigger_changerace(u, u_race(u), u->irace);
+            if (trestore) {
+                int duration = 2 + rng_int() % 8;
 
-                    add_trigger(&u->attribs, "timer", trigger_timeout(duration,
-                        trestore));
-                    u->irace = NULL;
-                    u_setrace(u, rcfailure);
-                }
+                add_trigger(&u->attribs, "timer", trigger_timeout(duration,
+                    trestore));
+                u->irace = NULL;
+                u_setrace(u, rcfailure);
             }
         }
     }
diff --git a/src/kernel/save.c b/src/kernel/save.c
index 0006bd6ac..5bb7eebf8 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -383,11 +383,12 @@ unit *read_unit(gamedata *data)
     char obuf[DISPLAYSIZE];
     faction *f;
     char rname[32];
-    static const struct race * rc_demon;
+    static const struct race *rc_demon, *rc_smurf;
     static int config;
 
     if (rc_changed(&config)) {
         rc_demon = get_race(RC_DAEMON);
+        rc_smurf = rc_find("smurf");
     }
 
     READ_INT(data->store, &n);
@@ -529,11 +530,18 @@ unit *read_unit(gamedata *data)
     }
     read_attribs(data, &u->attribs, u);
     if (rc_demon) {
-        if (u_race(u) == rc_demon) {
+        const struct race *rc = u_race(u);
+        if (rc == rc_smurf) {
+            if (!u->attribs) {
+                log_error("%s was a %s in a %s faction", unitname(u), rc->_name, u->faction->race->_name);
+                u->_race = u->faction->race;
+            }
+        }
+        if (rc == rc_demon) {
             if (data->version < FIX_SHAPESHIFT_VERSION) {
                 const char* zRace = get_racename(u->attribs);
                 if (zRace) {
-                    const struct race* rc = rc_find(zRace);
+                    rc = rc_find(zRace);
                     if (rc) {
                         set_racename(&u->attribs, NULL);
                             u->irace = rc;