Merge pull request #486 from eressea/hotfix/datafile-read-3.7.11

third try: upgrade to 3.7.11, read 3.8 datafiles

scripts/tests/e3/castles.lua

@@ -7,6 +7,10 @@ function setup()
     eressea.settings.set("rules.food.flags", "4")
 end
 
+function teardown()
+    eressea.settings.set("rules.food.flags", "0")
+end
+
 function test_small_castles()
 	local r = region.create(0, 0, "plain")
 	local f1 = faction.create("noreply@eressea.de", "human", "de")

scripts/tests/e3/morale.lua

@@ -4,12 +4,17 @@ module("tests.e3.morale", package.seeall, lunit.testcase )
 
 function setup()
     eressea.game.reset()
+    eressea.settings.set("rules.food.flags", "4") -- food is free
 end
 
-function test_when_owner_returns_morale_drops_only_2()
+function teardown()
+    eressea.settings.set("rules.food.flags", "0")
+end
+
+function test_when_owner_returns_morale_stays()
   local r = region.create(0, 0, "plain")
   assert_equal(1, r.morale)
-  local f1 = faction.create("noreply@eressea.de", "human", "de")
+  local f1 = faction.create("owner_returns@eressea.de", "human", "de")
   local u1 = unit.create(f1, r, 1)
   u1:add_item("money", 10000)
   local b = building.create(r, "castle")
@@ -25,21 +30,21 @@ function test_when_owner_returns_morale_drops_only_2()
   assert_equal(5, r.morale) -- no owner, fall by 1
   u1.building = b
   update_owners()
-  set_key("test", 42)
   process_orders()
-  assert_equal(3, r.morale) -- new owner, fall by 2
+  assert_equal(5, r.morale) -- old owner returns, no reduction
+  assert_false(r.is_mourning)
 end
 
 function test_morale_alliance()
   local r = region.create(0, 0, "plain")
   assert_equal(1, r.morale)
-  local f1 = faction.create("noreply@eressea.de", "human", "de")
+  local f1 = faction.create("ma1@eressea.de", "human", "de")
   local u1 = unit.create(f1, r, 1)
   u1:add_item("money", 10000)
-  local f2 = faction.create("noreply@eressea.de", "human", "de")
+  local f2 = faction.create("ma2@eressea.de", "human", "de")
   local u2 = unit.create(f2, r, 1)
   u2:add_item("money", 10000)
-  local f3 = faction.create("noreply@eressea.de", "human", "de")
+  local f3 = faction.create("ma3@eressea.de", "human", "de")
   local u3 = unit.create(f3, r, 1)
   u3:add_item("money", 10000)
 
@@ -65,27 +70,68 @@ function test_morale_alliance()
   -- just checking everything's okay after setup.
   run_a_turn()
   assert_equal(6, r.morale)
+  assert_false(r.is_mourning)
+
   
   -- change owner, new owner is in the same alliance
   u1.building = nil
   run_a_turn()
   assert_equal(4, r.morale)
+  assert_true(r.is_mourning)
+
+  run_a_turn()
+  assert_false(r.is_mourning) -- mourning recovers
+
   
   -- change owner, new owner is not in the same alliance
   u2.building = nil
   run_a_turn()
   assert_equal(0, r.morale)
+  assert_true(r.is_mourning)
+  run_a_turn()
+  assert_false(r.is_mourning) -- mourning recovers
+end
+
+function test_bigger_castle_empty()
+    local r = region.create(0, 0, "plain")
+    assert_equal(1, r.morale)
+    local f1 = faction.create("small1@eressea.de", "human", "de")
+    local u1 = unit.create(f1, r, 1)
+    local f2 = faction.create("small2@eressea.de", "human", "de")
+    local u2 = unit.create(f2, r, 1)
+    u1:add_item("money", 10000)
+    
+    local big = building.create(r, "castle")
+    big.size = 20
+    u1.building = big
+
+    local small = building.create(r, "castle")
+    small.size = 10
+    u2.building = small
+
+    local function run_a_turn()
+        process_orders()
+        f1.lastturn=get_turn()
+    end
+
+    update_owners()
+    assert_equal(r.owner, u1.faction)
+    u1.building = nil
+    update_owners()
+    assert_equal(r.owner, u2.faction)
+    assert_equal(0, r.morale)
+    assert_true(r.is_mourning)
+
+    run_a_turn()
+    assert_false(r.is_mourning) -- mourning recovers
 end
 
 function test_morale_change()
     local r = region.create(0, 0, "plain")
     assert_equal(1, r.morale)
-    local f1 = faction.create("noreply@eressea.de", "human", "de")
+    local f1 = faction.create("mchange@eressea.de", "human", "de")
     local u1 = unit.create(f1, r, 1)
     u1:add_item("money", 10000)
-    local f2 = faction.create("noreply@eressea.de", "human", "de")
-    local u2 = unit.create(f2, r, 1)
-    u2:add_item("money", 10000)
     
     local AVG_STEP = 6
     local b = building.create(r, "castle")
@@ -95,38 +141,44 @@ function test_morale_change()
     local function run_a_turn()
         process_orders()
         f1.lastturn=get_turn()
-        f2.lastturn=get_turn()
     end
   
     -- reinhardt-regel: nach 2*AVG_STEP ist moral mindestens einmal gestiegen.
     update_owners()
     assert_not_equal(r.owner, nil)
+    assert_false(r.is_mourning)
     for i=1,AVG_STEP*2 do
         run_a_turn()
         assert_not_equal(r.owner, nil)
     end
     assert_not_equal(1, r.morale)
+    assert_false(r.is_mourning)
 
     -- regel: moral ist nie hoeher als 2 punkte ueber burgen-max.
     for i=1,AVG_STEP*4 do
         run_a_turn()
     end
     assert_equal(4, r.morale)
+    assert_false(r.is_mourning)
   
     -- auch mit herrscher faellt moral um 1 pro woche, wenn moral > burgstufe
     r.morale = 6
     run_a_turn()
     assert_equal(5, r.morale)
+    assert_false(r.is_mourning)
     run_a_turn()
     assert_equal(4, r.morale)
     run_a_turn()
     assert_equal(4, r.morale)
     
     -- regel: ohne herrscher fällt die moral jede woche um 1 punkt, bis sie 1 erreicht
+    assert_false(r.is_mourning)
     u1.building = nil
     update_owners()
+    assert_false(r.is_mourning)
     run_a_turn()
     assert_equal(3, r.morale)
+    assert_false(r.is_mourning)
     run_a_turn()
     assert_equal(2, r.morale)
     run_a_turn()
@@ -140,12 +192,12 @@ function test_morale_change()
     assert_equal(0, r.morale)
 end
 
-function test_morale_old()
+function test_morale_give_command()
   local r = region.create(0, 0, "plain")
   assert_equal(1, r.morale)
-  local f1 = faction.create("first@eressea.de", "human", "de")
+  local f1 = faction.create("mold1@eressea.de", "human", "de")
   local u1 = unit.create(f1, r, 1)
-  local f2 = faction.create("second@eressea.de", "human", "de")
+  local f2 = faction.create("mold2@eressea.de", "human", "de")
   local u2 = unit.create(f2, r, 1)
 
   local b = building.create(r, "castle")
@@ -154,25 +206,20 @@ function test_morale_old()
   u2.building = b
   update_owners()
   assert_equal(1, r.morale)
+  assert_false(r.is_mourning)
   r.morale = 5
   assert_equal(r.owner, u1.faction)
   u1:clear_orders()
   u1:add_order("GIB " .. itoa36(u2.id) .. " KOMMANDO")
+
   process_orders()
-  u1:clear_orders()
   assert_equal(u2.faction, r.owner)
-  assert_equal(3, r.morale) --  5-MORALE_TRANSFER
+  assert_equal(3, r.morale) --  5 - MORALE_TRANSFER
-  for u in r.units do
+  assert_true(r.is_mourning) 
-    if u.faction.id==u2.faction.id then
+
-      u.building = nil
+  u1:clear_orders()
-    end
+
-  end
+  process_orders()
-  update_owners()
+  assert_false(r.is_mourning) -- mourning recovers
-  assert_equal(r.owner, u1.faction)
-  assert_equal(0, r.morale)
 end
 
-function test_no_uruk()
-  local f1 = faction.create("noreply@eressea.de", "uruk", "de")
-  assert_equal(f1.race, "orc")
-end

scripts/tests/e3/rules.lua

@@ -789,3 +789,9 @@ function test_volcanooutbreak_message()
     assert_not_equal("", msg:render("de"))
     assert_not_equal("", msg:render("en"))
 end
+
+function test_no_uruk()
+  local f1 = faction.create("noreply@eressea.de", "uruk", "de")
+  assert_equal(f1.race, "orc")
+end
+

src/alchemy.c

@@ -219,9 +219,10 @@ static void free_potiondelay(attrib * a)
     free(a->data.v);
 }
 
-static int age_potiondelay(attrib * a)
+static int age_potiondelay(attrib * a, void *owner)
 {
     potiondelay *pd = (potiondelay *)a->data.v;
+    unused_arg(owner);
     pd->amount = do_potion(pd->u, pd->r, pd->ptype, pd->amount);
     return AT_AGE_REMOVE;
 }

src/attributes/hate.c

@@ -28,8 +28,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <storage.h>
 
-static int verify_hate(attrib * a)
+static int verify_hate(attrib * a, void *owner)
 {
+    unused_arg(owner);
     if (a->data.v == NULL) {
         return 0;
     }

src/attributes/moved.c

@@ -24,8 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <storage.h>
 
-static int age_moved(attrib * a)
+static int age_moved(attrib * a, void *owner)
 {
+    unused_arg(owner);
     --a->data.i;
     return a->data.i > 0;
 }

src/attributes/movement.c

@@ -65,8 +65,9 @@ void set_movement(attrib ** alist, int type)
     a->data.i |= type;
 }
 
-static int age_speedup(attrib * a)
+static int age_speedup(attrib * a, void *owner)
 {
+    unused_arg(owner);
     if (a->data.sa[0] > 0) {
         assert(a->data.sa[0] - a->data.sa[1] >= SHRT_MIN);
         assert(a->data.sa[0] - a->data.sa[1] <= SHRT_MAX);

src/attributes/reduceproduction.c

@@ -20,15 +20,26 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "reduceproduction.h"
 #include <kernel/save.h>
+#include <kernel/region.h>
+#include <kernel/messages.h>
+#include <util/message.h>
 #include <util/attrib.h>
+#include <assert.h>
 
-static int age_reduceproduction(attrib * a)
+static int age_reduceproduction(attrib * a, void *owner)
 {
+    region * r = (region *)owner;
     int reduce = 100 - (5 * --a->data.sa[1]);
-    if (reduce < 10)
+    assert(r);
+    if (reduce < 10) {
         reduce = 10;
+    }
     a->data.sa[0] = (short)reduce;
-    return (a->data.sa[1] > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
+    if (a->data.sa[1] > 0) {
+        ADDMSG(&r->msgs, msg_message("reduceproduction", ""));
+        return AT_AGE_KEEP;
+    }
+    return AT_AGE_REMOVE;
 }
 
 attrib_type at_reduceproduction = {

src/bind_region.c

@@ -210,6 +210,14 @@ static int tolua_region_set_morale(lua_State * L)
     return 0;
 }
 
+/* region mourning this turn */
+static int tolua_region_get_is_mourning(lua_State * L)
+{
+    region *r = (region *)tolua_tousertype(L, 1, 0);
+    lua_pushboolean(L, is_mourning(r, turn+1));
+    return 1;
+}
+
 static int tolua_region_get_adj(lua_State * L)
 {
     region *r = (region *)tolua_tousertype(L, 1, 0);
@@ -691,6 +699,7 @@ void tolua_region_open(lua_State * L)
                 tolua_region_set_name);
             tolua_variable(L, TOLUA_CAST "morale", tolua_region_get_morale,
                 tolua_region_set_morale);
+            tolua_variable(L, TOLUA_CAST "is_mourning", tolua_region_get_is_mourning, NULL);
             tolua_variable(L, TOLUA_CAST "info", tolua_region_get_info,
                 tolua_region_set_info);
             tolua_variable(L, TOLUA_CAST "units", tolua_region_get_units, NULL);

src/building_action.c

@@ -28,17 +28,16 @@ without prior permission by the authors of Eressea.
 #include <string.h>
 
 typedef struct building_action {
-    struct building *b;
     char *fname;
     char *param;
 } building_action;
 
-static int lc_age(struct attrib *a)
+static int lc_age(struct attrib *a, void *owner)
 {
     building_action *data = (building_action *)a->data.v;
     const char *fname = data->fname;
     const char *fparam = data->param;
-    building *b = data->b;
+    building *b = (building *)owner;
     int result = -1;
 
     assert(b != NULL);
@@ -93,9 +92,10 @@ lc_write(const struct attrib *a, const void *owner, struct storage *store)
     building_action *data = (building_action *)a->data.v;
     const char *fname = data->fname;
     const char *fparam = data->param;
-    building *b = data->b;
 
-    write_building_reference(b, store);
+#if RELEASE_VERSION < ATTRIBOWNER_VERSION
+    write_building_reference((building *)owner, store);
+#endif
     WRITE_TOK(store, fname);
     WRITE_TOK(store, fparam ? fparam : NULLSTRING);
 }
@@ -104,13 +104,17 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store)
 {
     char name[NAMESIZE];
     building_action *data = (building_action *)a->data.v;
-    int result =
+    building *b = (building *)owner;
-        read_reference(&data->b, store, read_building_reference, resolve_building);
+    int result = 0;
+    if (global.data_version < ATTRIBOWNER_VERSION) {
+        result = read_reference(&b, store, read_building_reference, resolve_building);
+        assert(b == owner);
+    }
     READ_TOK(store, name, sizeof(name));
     if (strcmp(name, "tunnel_action") == 0) {
         /* E2: Weltentor has a new module, doesn't need this any longer */
         result = 0;
-        data->b = 0;
+        b = 0;
     }
     else {
         data->fname = _strdup(name);
@@ -119,14 +123,14 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store)
     if (strcmp(name, "tnnL") == 0) {
         /* tunnel_action was the old Weltentore, their code has changed. ignore this object */
         result = 0;
-        data->b = 0;
+        b = 0;
     }
     if (strcmp(name, NULLSTRING) == 0)
         data->param = 0;
     else {
         data->param = _strdup(name);
     }
-    if (result == 0 && !data->b) {
+    if (result == 0 && !b) {
         return AT_READ_FAIL;
     }
     return AT_READ_OK;
@@ -143,7 +147,6 @@ void building_addaction(building * b, const char *fname, const char *param)
 {
     attrib *a = a_add(&b->attribs, a_new(&at_building_action));
     building_action *data = (building_action *)a->data.v;
-    data->b = b;
     data->fname = _strdup(fname);
     if (param) {
         data->param = _strdup(param);

src/buildno.h

@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 7
-#define VERSION_BUILD 10
+#define VERSION_BUILD 11

src/items/artrewards.c

@@ -45,8 +45,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define HORNDURATION 3
 #define HORNIMMUNITY 30
 
-static int age_peaceimmune(attrib * a)
+static int age_peaceimmune(attrib * a, void *owner)
 {
+    unused_arg(owner);
     return (--a->data.i > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
 }
 

src/kernel/curse.c

@@ -112,11 +112,12 @@ void curse_init(attrib * a)
     a->data.v = calloc(1, sizeof(curse));
 }
 
-int curse_age(attrib * a)
+int curse_age(attrib * a, void *owner)
 {
     curse *c = (curse *)a->data.v;
     int result = 0;
 
+    unused_arg(owner);
     c_clearflag(c, CURSE_ISNEW);
 
     if (c_flags(c) & CURSE_NOAGE) {

src/kernel/curse.h

@@ -291,7 +291,7 @@ extern "C" {
 
     void curse_init(struct attrib *a);
     void curse_done(struct attrib *a);
-    int curse_age(struct attrib *a);
+    int curse_age(struct attrib *a, void *owner);
 
     double destr_curse(struct curse *c, int cast_level, double force);
 

src/kernel/region.c

@@ -1273,12 +1273,21 @@ struct faction *region_get_owner(const struct region *r)
     return NULL;
 }
 
+struct faction *region_get_last_owner(const struct region *r)
+{
+    assert(rule_region_owners());
+    if (r->land && r->land->ownership) {
+        return r->land->ownership->last_owner;
+    }
+    return NULL;
+}
+
 struct alliance *region_get_alliance(const struct region *r)
 {
     assert(rule_region_owners());
     if (r->land && r->land->ownership) {
         region_owner *own = r->land->ownership;
-        return own->owner ? own->owner->alliance : own->alliance;
+        return own->owner ? own->owner->alliance : (own->last_owner? own->last_owner->alliance : NULL);
     }
     return NULL;
 }
@@ -1291,16 +1300,14 @@ void region_set_owner(struct region *r, struct faction *owner, int turn)
             r->land->ownership = malloc(sizeof(region_owner));
             assert(region_get_morale(r) == MORALE_DEFAULT);
             r->land->ownership->owner = NULL;
-            r->land->ownership->alliance = NULL;
+            r->land->ownership->last_owner = NULL;
             r->land->ownership->flags = 0;
         }
         r->land->ownership->since_turn = turn;
         r->land->ownership->morale_turn = turn;
         assert(r->land->ownership->owner != owner);
+        r->land->ownership->last_owner = r->land->ownership->owner;
         r->land->ownership->owner = owner;
-        if (owner) {
-            r->land->ownership->alliance = owner->alliance;
-        }
     }
 }
 
@@ -1314,40 +1321,35 @@ faction *update_owners(region * r)
         if (blargest) {
             if (!bowner || bowner->size < blargest->size) {
                 /* region owners update? */
-                unit *u = building_owner(blargest);
+                unit *new_owner = building_owner(blargest);
                 f = region_get_owner(r);
-                if (u == NULL) {
+                if (new_owner == NULL) {
                     if (f) {
                         region_set_owner(r, NULL, turn);
-                        r->land->ownership->flags |= OWNER_MOURNING;
                         f = NULL;
                     }
                 }
-                else if (u->faction != f) {
+                else if (new_owner->faction != f) {
                     if (!r->land->ownership) {
                         /* there has never been a prior owner */
                         region_set_morale(r, MORALE_DEFAULT, turn);
                     }
-                    else {
+                    else if (f || new_owner->faction != region_get_last_owner(r)) {
                         alliance *al = region_get_alliance(r);
-                        if (al && u->faction->alliance == al) {
+                        if (al && new_owner->faction->alliance == al) {
                             int morale = _max(0, r->land->morale - MORALE_TRANSFER);
                             region_set_morale(r, morale, turn);
                         }
                         else {
                             region_set_morale(r, MORALE_TAKEOVER, turn);
-                            if (f) {
-                                r->land->ownership->flags |= OWNER_MOURNING;
-                            }
                         }
                     }
-                    region_set_owner(r, u->faction, turn);
+                    region_set_owner(r, new_owner->faction, turn);
-                    f = u->faction;
+                    f = new_owner->faction;
                 }
             }
         }
         else if (r->land->ownership && r->land->ownership->owner) {
-            r->land->ownership->flags |= OWNER_MOURNING;
             region_set_owner(r, NULL, turn);
             f = NULL;
         }
@@ -1421,6 +1423,6 @@ int owner_change(const region * r)
 bool is_mourning(const region * r, int in_turn)
 {
     int change = owner_change(r);
-    return (change == in_turn - 1
+    return (change == in_turn - 1 && r->land->ownership->last_owner && r->land->ownership->owner
-        && (r->land->ownership->flags & OWNER_MOURNING));
+        && r->land->ownership->last_owner != r->land->ownership->owner);
 }

src/kernel/region.h

@@ -72,10 +72,9 @@ extern "C" {
 #define MORALE_AVERAGE 6        /* default average time for morale to change */
 #define MORALE_TRANSFER 2       /* points of morale lost when GIVE COMMAND */
 
-#define OWNER_MOURNING 0x01
     typedef struct region_owner {
         struct faction *owner;
-        struct alliance *alliance;
+        struct faction *last_owner;
         int since_turn;             /* turn the region changed owners */
         int morale_turn;            /* turn when morale has changed most recently */
         int flags;

src/kernel/save.c

@@ -490,9 +490,6 @@ static int resolve_owner(variant id, void *address)
         }
     }
     owner->owner = f;
-    if (f) {
-        owner->alliance = f->alliance;
-    }
     return result;
 }
 
@@ -511,13 +508,20 @@ static void read_owner(struct gamedata *data, region_owner ** powner)
         else {
             owner->flags = 0;
         }
-        if (data->version >= OWNER_2_VERSION) {
+        if (data->version >= OWNER_3_VERSION) {
             int id;
             READ_INT(data->store, &id);
-            owner->alliance = id ? findalliance(id) : NULL;
+            owner->last_owner = id ? findfaction(id) : NULL;
+        } else if (data->version >= OWNER_2_VERSION) {
+            int id;
+            alliance *a;
+            READ_INT(data->store, &id);
+            a = id ? findalliance(id) : NULL;
+            /* don't know which faction, take the leader */
+            owner->last_owner = a? a->_leader : NULL;
         }
         else {
-            owner->alliance = NULL;
+            owner->last_owner = NULL;
         }
         read_reference(owner, data->store, &read_faction_reference, &resolve_owner);
         *powner = owner;
@@ -533,7 +537,7 @@ static void write_owner(struct gamedata *data, region_owner * owner)
         WRITE_INT(data->store, owner->since_turn);
         WRITE_INT(data->store, owner->morale_turn);
         WRITE_INT(data->store, owner->flags);
-        WRITE_INT(data->store, owner->alliance ? owner->alliance->id : 0);
+        write_faction_reference(owner->last_owner, data->store);
         write_faction_reference(owner->owner, data->store);
     }
     else {
@@ -1152,6 +1156,23 @@ void write_spellbook(const struct spellbook *book, struct storage *store)
     WRITE_TOK(store, "end");
 }
 
+char * getpasswd(int fno) {
+    const char *prefix = itoa36(fno);
+    size_t len = strlen(prefix);
+    FILE * F = fopen("passwords.txt", "r");
+    char line[80];
+    if (F) {
+        while (!feof(F)) {
+            fgets(line, sizeof(line), F);
+            if (line[len+1]==':' && strncmp(prefix, line, len)==0) {
+                fclose(F);
+                return _strdup(line+len+1);
+            }
+        }
+        fclose(F);
+    }
+    return NULL;
+}
 /** Reads a faction from a file.
  * This function requires no context, can be called in any state. The
  * faction may not already exist, however.
@@ -1219,7 +1240,11 @@ faction *readfaction(struct gamedata * data)
     }
 
     READ_STR(data->store, name, sizeof(name));
-    f->passw = _strdup(name);
+    if (data->version < CRYPT_VERSION) {
+        f->passw = _strdup(name);
+    } else {
+        f->passw = getpasswd(f->no);
+    }
     if (data->version < NOOVERRIDE_VERSION) {
         READ_STR(data->store, 0, 0);
     }

src/kernel/unit.c

@@ -771,10 +771,11 @@ void set_level(unit * u, skill_t sk, int value)
     sk_set(add_skill(u, sk), value);
 }
 
-static int leftship_age(struct attrib *a)
+static int leftship_age(struct attrib *a, void *owner)
 {
     /* must be aged, so it doesn't affect report generation (cansee) */
     unused_arg(a);
+    unused_arg(owner);
     return AT_AGE_REMOVE;         /* remove me */
 }
 

src/kernel/unit.test.c

@@ -341,12 +341,12 @@ static void test_age_familiar(CuTest *tc) {
     CuAssertIntEquals(tc, true, create_newfamiliar(mag, fam));
     CuAssertPtrEquals(tc, fam, get_familiar(mag));
     CuAssertPtrEquals(tc, mag, get_familiar_mage(fam));
-    a_age(&fam->attribs);
+    a_age(&fam->attribs, fam);
-    a_age(&mag->attribs);
+    a_age(&mag->attribs, mag);
     CuAssertPtrEquals(tc, fam, get_familiar(mag));
     CuAssertPtrEquals(tc, mag, get_familiar_mage(fam));
     set_number(fam, 0);
-    a_age(&mag->attribs);
+    a_age(&mag->attribs, mag);
     CuAssertPtrEquals(tc, 0, get_familiar(mag));
     test_cleanup();
 }

src/kernel/version.h

@@ -31,9 +31,11 @@
 #define JSON_REPORT_VERSION 346 /* bit 3 in f->options flags the json report */
 #define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */
 #define SPELL_LEVEL_VERSION 348 /* f->max_spelllevel gets stored, not calculated */
-
+#define OWNER_3_VERSION 349 /* regions store last owner, not last alliance */
-#define RELEASE_VERSION SPELL_LEVEL_VERSION /* current datafile */
+#define ATTRIBOWNER_VERSION 350 /* all attrib_type functions know who owns the attribute */
+#define CRYPT_VERSION 351 /* passwords are encrypted */
+#define RELEASE_VERSION ATTRIBOWNER_VERSION /* current datafile */
 #define MIN_VERSION INTPAK_VERSION      /* minimal datafile we support */
-#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */
+#define MAX_VERSION CRYPT_VERSION /* change this if we can need to read the future datafile, and we can do so */
 
 #define STREAM_VERSION 2 /* internal encoding of binary files */

src/laws.c

@@ -3096,7 +3096,7 @@ static building *age_building(building * b)
         }
     }
 
-    a_age(&b->attribs);
+    a_age(&b->attribs, b);
     handle_event(b->attribs, "timer", b);
 
     if (b->type->age) {
@@ -3108,7 +3108,7 @@ static building *age_building(building * b)
 
 static void age_region(region * r)
 {
-    a_age(&r->attribs);
+    a_age(&r->attribs, r);
     handle_event(r->attribs, "timer", r);
 
     if (!r->land)
@@ -3153,7 +3153,7 @@ static void ageing(void)
 
     /* Factions */
     for (f = factions; f; f = f->next) {
-        a_age(&f->attribs);
+        a_age(&f->attribs, f);
         handle_event(f->attribs, "timer", f);
     }
 
@@ -3168,7 +3168,7 @@ static void ageing(void)
         /* Einheiten */
         for (up = &r->units; *up;) {
             unit *u = *up;
-            a_age(&u->attribs);
+            a_age(&u->attribs, u);
             if (u == *up)
                 handle_event(u->attribs, "timer", u);
             if (u == *up)
@@ -3178,7 +3178,7 @@ static void ageing(void)
         /* Schiffe */
         for (sp = &r->ships; *sp;) {
             ship *s = *sp;
-            a_age(&s->attribs);
+            a_age(&s->attribs, s);
             if (s == *sp)
                 handle_event(s->attribs, "timer", s);
             if (s == *sp)

src/magic.c

@@ -149,17 +149,19 @@ static void
 a_writeicastle(const attrib * a, const void *owner, struct storage *store)
 {
     icastle_data *data = (icastle_data *)a->data.v;
+    assert(owner == data->building);
     WRITE_TOK(store, data->type->_name);
     WRITE_INT(store, data->building->no);
     WRITE_INT(store, data->time);
 }
 
-static int a_ageicastle(struct attrib *a)
+static int a_ageicastle(struct attrib *a, void *owner)
 {
     icastle_data *data = (icastle_data *)a->data.v;
     if (data->time <= 0) {
-        building *b = data->building;
+        building *b = data->building; // TODO: use owner
         region *r = b->region;
+        assert(owner == b);
         ADDMSG(&r->msgs, msg_message("icastle_dissolve", "building", b));
         /* remove_building lets units leave the building */
         remove_building(&r->buildings, b);
@@ -2388,10 +2390,11 @@ static int read_magician(attrib * a, void *owner, struct storage *store)
     return AT_READ_OK;
 }
 
-static int age_unit(attrib * a)
+static int age_unit(attrib * a, void *owner)
 /* if unit is gone or dead, remove the attribute */
 {
     unit *u = (unit *)a->data.v;
+    unused_arg(owner);
     return (u != NULL && u->number > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
 }
 

src/magic.h

@@ -208,7 +208,7 @@ extern "C" {
 
     typedef struct icastle_data {
         const struct building_type *type;
-        struct building *building;  /* reverse pointer to dissolve the object */
+        struct building *building;  // TODO: remove, use owner argument
         int time;
     } icastle_data;
 

src/modules/arena.c

@@ -212,11 +212,12 @@ order * ord)
 /**
  * Tempel der Schreie, Demo-Gebäude **/
 
-static int age_hurting(attrib * a)
+static int age_hurting(attrib * a, void *owner)
 {
     building *b = (building *)a->data.v;
     unit *u;
     int active = 0;
+    assert(owner == b);
     if (b == NULL)
         return AT_AGE_REMOVE;
     for (u = b->region->units; u; u = u->next) {

src/move.c

@@ -135,9 +135,10 @@ static void shiptrail_finalize(attrib * a)
     free(a->data.v);
 }
 
-static int shiptrail_age(attrib * a)
+static int shiptrail_age(attrib * a, void *owner)
 {
     traveldir *t = (traveldir *)(a->data.v);
+    unused_arg(owner);
 
     t->age--;
     return (t->age > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;

src/move.test.c

@@ -287,9 +287,9 @@ static void test_age_trails(CuTest *tc) {
     move_ship(sh, r1, r2, route);
 
     CuAssertPtrNotNull(tc, r1->attribs);
-    a_age(&r1->attribs);
+    a_age(&r1->attribs, r1);
     CuAssertPtrNotNull(tc, r1->attribs);
-    a_age(&r1->attribs);
+    a_age(&r1->attribs, r1);
     CuAssertPtrEquals(tc, 0, r1->attribs);
     free_regionlist(route);
     test_cleanup();

src/spells.test.c

@@ -42,7 +42,7 @@ static void test_good_dreams(CuTest *tc) {
     CuAssertTrue(tc, curse && curse->duration > 1);
     CuAssertTrue(tc, curse->effect == 1);
 
-    a_age(&r->attribs);
+    a_age(&r->attribs, r);
     CuAssertIntEquals_Msg(tc, "good dreams give +1 to allies", 1, get_modifier(u1, SK_MELEE, 11, r, false));
     CuAssertIntEquals_Msg(tc, "good dreams have no effect on non-allies", 0, get_modifier(u2, SK_MELEE, 11, r, false));
     free_castorder(&co);
@@ -67,7 +67,7 @@ static void test_dreams(CuTest *tc) {
 
     sp_gooddreams(&co);
     sp_baddreams(&co);
-    a_age(&r->attribs);
+    a_age(&r->attribs, r);
     CuAssertIntEquals_Msg(tc, "good dreams in same region as bad dreams", 1, get_modifier(u1, SK_MELEE, 11, r, false));
     CuAssertIntEquals_Msg(tc, "bad dreams in same region as good dreams", -1, get_modifier(u2, SK_MELEE, 11, r, false));
 
@@ -98,7 +98,7 @@ static void test_bad_dreams(CuTest *tc) {
     CuAssertTrue(tc, curse && curse->duration > 1);
     CuAssertTrue(tc, curse->effect == -1);
 
-    a_age(&r->attribs);
+    a_age(&r->attribs, r);
     CuAssertIntEquals_Msg(tc, "bad dreams have no effect on allies", 0, get_modifier(u1, SK_MELEE, 11, r, false));
     CuAssertIntEquals_Msg(tc, "bad dreams give -1 to non-allies", -1, get_modifier(u2, SK_MELEE, 11, r, false));
 

src/spells/alp.c

@@ -46,7 +46,7 @@ extern const char *directions[];
 
 typedef struct alp_data {
     unit *mage;
-    unit *target;
+    unit *target; // TODO: remove, use attribute-owner?
 } alp_data;
 
 static void alp_init(attrib * a)
@@ -59,9 +59,10 @@ static void alp_done(attrib * a)
     free(a->data.v);
 }
 
-static int alp_verify(attrib * a)
+static int alp_verify(attrib * a, void *owner)
 {
     alp_data *ad = (alp_data *)a->data.v;
+    unused_arg(owner);
     if (ad->mage && ad->target)
         return 1;
     return 0;                     /* remove the attribute */

src/util/attrib.c

@@ -252,7 +252,7 @@ attrib *a_new(const attrib_type * at)
     return a;
 }
 
-int a_age(attrib ** p)
+int a_age(attrib ** p, void *owner)
 {
     attrib **ap = p;
     /* Attribute altern, und die Entfernung (age()==0) eines Attributs
@@ -260,7 +260,7 @@ int a_age(attrib ** p)
     while (*ap) {
         attrib *a = *ap;
         if (a->type->age) {
-            int result = a->type->age(a);
+            int result = a->type->age(a, owner);
             assert(result >= 0 || !"age() returned a negative value");
             if (result == AT_AGE_REMOVE) {
                 a_remove(p, a);

src/util/attrib.h

@@ -52,7 +52,7 @@ extern "C" {
         const char *name;
         void(*initialize) (struct attrib *);
         void(*finalize) (struct attrib *);
-        int(*age) (struct attrib *);
+        int(*age) (struct attrib *, void *owner);
         /* age returns 0 if the attribute needs to be removed, !=0 otherwise */
         void(*write) (const struct attrib *, const void *owner, struct storage *);
         int(*read) (struct attrib *, void *owner, struct storage *);       /* return AT_READ_OK on success, AT_READ_FAIL if attrib needs removal */
@@ -74,7 +74,7 @@ extern "C" {
     extern void a_removeall(attrib ** a, const attrib_type * at);
     extern attrib *a_new(const attrib_type * at);
 
-    extern int a_age(attrib ** attribs);
+    extern int a_age(attrib ** attribs, void *owner);
     extern int a_read(struct storage *store, attrib ** attribs, void *owner);
     extern void a_write(struct storage *store, const attrib * attribs,
         const void *owner);

src/vortex.c

@@ -66,9 +66,10 @@ static void a_freedirection(attrib * a)
     free(d);
 }
 
-static int a_agedirection(attrib * a)
+static int a_agedirection(attrib * a, void *owner)
 {
     spec_direction *d = (spec_direction *)(a->data.v);
+    unused_arg(owner);
     --d->duration;
     return (d->duration > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
 }
@@ -78,7 +79,7 @@ static int a_readdirection(attrib * a, void *owner, struct storage *store)
     spec_direction *d = (spec_direction *)(a->data.v);
     char lbuf[32];
 
-    (void)owner;
+    unused_arg(owner);
     READ_INT(store, &d->x);
     READ_INT(store, &d->y);
     READ_INT(store, &d->duration);
@@ -95,7 +96,7 @@ a_writedirection(const attrib * a, const void *owner, struct storage *store)
 {
     spec_direction *d = (spec_direction *)(a->data.v);
 
-    (void)owner;
+    unused_arg(owner);
     WRITE_INT(store, d->x);
     WRITE_INT(store, d->y);
     WRITE_INT(store, d->duration);

src/wormhole.c

@@ -56,7 +56,7 @@ static int cmp_age(const void *v1, const void *v2)
 }
 
 typedef struct wormhole_data {
-    building *entry;
+    building *entry; // TODO: remove, use attribute-owner
     region *exit;
 } wormhole_data;
 
@@ -70,13 +70,14 @@ static void wormhole_done(struct attrib *a)
     free(a->data.v);
 }
 
-static int wormhole_age(struct attrib *a)
+static int wormhole_age(struct attrib *a, void *owner)
 {
     wormhole_data *data = (wormhole_data *)a->data.v;
     int maxtransport = data->entry->size;
     region *r = data->entry->region;
     unit *u = r->units;
 
+    unused_arg(owner);
     for (; u != NULL && maxtransport != 0; u = u->next) {
         if (u->building == data->entry) {
             message *m = NULL;