From 21aee8ece8436bddaeca95651e689b52f957e17e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 13 Feb 2016 15:44:15 +0100
Subject: [PATCH] remove global.data_version where gamedata.version is
 available github issue #479

---
 src/kernel/save.c   | 11 ++++++-----
 src/triggers/gate.c |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/kernel/save.c b/src/kernel/save.c
index 30c141c76..e4159998c 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -419,11 +419,12 @@ void read_items(struct storage *store, item ** ilist)
     }
 }
 
-static void read_alliances(struct storage *store)
+static void read_alliances(struct gamedata *data)
 {
+    storage *store = data->store;
     char pbuf[8];
     int id, terminator = 0;
-    if (global.data_version < ALLIANCELEADER_VERSION) {
+    if (data->version < ALLIANCELEADER_VERSION) {
         terminator = atoi36("end");
         READ_STR(store, pbuf, sizeof(pbuf));
         id = atoi36(pbuf);
@@ -436,10 +437,10 @@ static void read_alliances(struct storage *store)
         alliance *al;
         READ_STR(store, aname, sizeof(aname));
         al = makealliance(id, aname);
-        if (global.data_version >= OWNER_2_VERSION) {
+        if (data->version >= OWNER_2_VERSION) {
             READ_INT(store, &al->flags);
         }
-        if (global.data_version >= ALLIANCELEADER_VERSION) {
+        if (data->version >= ALLIANCELEADER_VERSION) {
             read_reference(&al->_leader, store, read_faction_reference,
                 resolve_faction);
             READ_INT(store, &id);
@@ -1591,7 +1592,7 @@ int readgame(const char *filename, bool backup)
     }
 
     /* Read factions */
-    read_alliances(&store);
+    read_alliances(&gdata);
     READ_INT(&store, &nread);
     log_debug(" - Einzulesende Parteien: %d\n", nread);
     fp = &factions;
diff --git a/src/triggers/gate.c b/src/triggers/gate.c
index 3f5552fa2..7f7123b9a 100644
--- a/src/triggers/gate.c
+++ b/src/triggers/gate.c
@@ -81,7 +81,7 @@ static int gate_read(trigger * t, gamedata *data)
         read_reference(&gd->gate, data->store, read_building_reference, resolve_building);
     int rc =
         read_reference(&gd->target, data->store, read_region_reference,
-        RESOLVE_REGION(global.data_version));
+        RESOLVE_REGION(data->version));
 
     if (bc == 0 && rc == 0) {
         if (!gd->gate || !gd->target)