From 8c0fc4bd918610edabded2bb2da3c92f164aeaa2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Tue, 30 Apr 2019 18:56:37 +0200
Subject: [PATCH 1/3] 2577: Fix resource values, again.

---
 src/kernel/gamedata.h |  3 ++-
 src/kernel/save.c     | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/kernel/gamedata.h b/src/kernel/gamedata.h
index 986b13d1d..64732b7fc 100644
--- a/src/kernel/gamedata.h
+++ b/src/kernel/gamedata.h
@@ -42,8 +42,9 @@
 #define FAMILIAR_FIXMAGE_VERSION 364 /* familiar links are fixed */
 #define FAMILIAR_FIXSPELLBOOK_VERSION 365 /* familiar spells are fixed */
 #define FIX_STARTLEVEL_VERSION 366 /* fixing resource startlevels */
+#define FIX_RES_BASE_VERSION 367 /* fixing resource base */
 
-#define RELEASE_VERSION FIX_STARTLEVEL_VERSION /* current datafile */
+#define RELEASE_VERSION FIX_RES_BASE_VERSION /* current datafile */
 #define MIN_VERSION UIDHASH_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 */
 
diff --git a/src/kernel/save.c b/src/kernel/save.c
index 0b3ade593..f5e66162b 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -613,7 +613,7 @@ static void read_regioninfo(gamedata *data, const region *r, char *info, size_t
     }
 }
 
-static void fix_baselevel(region *r) {
+static void fix_resource_levels(region *r) {
     struct terrain_production *p;
     for (p = r->terrain->production; p->type; ++p) {
         char *end;
@@ -634,6 +634,27 @@ static void fix_baselevel(region *r) {
     }
 }
 
+static void fix_resource_bases(region *r) {
+    struct terrain_production *p;
+    for (p = r->terrain->production; p->type; ++p) {
+        char *end;
+        long base = (int)strtol(p->base, &end, 10);
+        if (*end == '\0') {
+            rawmaterial *res;
+            for (res = r->resources; res; res = res->next) {
+                if (p->type == res->rtype) {
+                    if (base != res->base) {
+                        log_debug("setting resource base for %s in %s to %d",
+                            res->rtype->_name, regionname(r, NULL), base);
+                        res->base = base;
+                    }
+                }
+            }
+        }
+
+    }
+}
+
 static region *readregion(gamedata *data, int x, int y)
 {
     region *r;
@@ -803,9 +824,15 @@ static region *readregion(gamedata *data, int x, int y)
     }
     read_attribs(data, &r->attribs, r);
 
-    if (r->resources && data->version < FIX_STARTLEVEL_VERSION) {
-        /* we had some badly made rawmaterials before this */
-        fix_baselevel(r);
+    if (r->resources) {
+        if (data->version < FIX_STARTLEVEL_VERSION) {
+            /* we had some badly made rawmaterials before this */
+            fix_resource_levels(r);
+        }
+        if (data->version < FIX_RES_BASE_VERSION) {
+            /* we had some badly made rawmaterials before this */
+            fix_resource_bases(r);
+        }
     }
     return r;
 }

From 5cde26e25ea7eecb90ca2806285f47c28703f27e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 26 Apr 2019 18:56:38 +0200
Subject: [PATCH 2/3] preview gets games as arguments, game 4 is over

---
 process/cron/preview.cron | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/process/cron/preview.cron b/process/cron/preview.cron
index eb39fd8f8..63fe2ca76 100755
--- a/process/cron/preview.cron
+++ b/process/cron/preview.cron
@@ -1,17 +1,17 @@
 #!/bin/bash
 (
 [ "$PREVIEW" != "yes" ] && exit
-[ -z ${ERESSEA} ] && ERESSEA=$HOME/eressea
+[ -z "${ERESSEA}" ] && ERESSEA="$HOME/eressea"
 
 branch="develop"
-if [ -e ${ERESSEA}/build/.preview ]; then
-    branch=`cat ${ERESSEA}/build/.preview`
+if [ -e "${ERESSEA}/build/.preview" ]; then
+    branch=$(cat "${ERESSEA}/build/.preview")
 fi
-SRC=${ERESSEA}/git
-${SRC}/s/preview build ${branch} || exit $?
-for game in 2 3 4 ; do
-	${SRC}/s/preview -g ${game} run && \
-	${SRC}/s/preview -g ${game} send
+SRC="${ERESSEA}/git"
+"${SRC}/s/preview" build "$branch" || exit $?
+for game in "$@" ; do
+	"${SRC}/s/preview" -g "$game" run && \
+	"${SRC}/s/preview" -g "$game" send
 done
-) | tee -a $HOME/log/preview.cron.log
+) | tee -a "$HOME/log/preview.cron.log"
 

From 505ad39ddfdf3927f0962300807cfc1a52ad66de Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Tue, 30 Apr 2019 19:00:03 +0200
Subject: [PATCH 3/3] coverity cert hack

---
 s/coverity | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s/coverity b/s/coverity
index 3d218adb7..01bb2a042 100755
--- a/s/coverity
+++ b/s/coverity
@@ -6,7 +6,7 @@ cd Debug
 make clean
 ../../coverity/bin/cov-build --dir cov-int make eressea
 tar czf eressea.tgz cov-int
-curl --form token=IISXKH3A1ngZGfFmBz_aSA \
+curl -k --form token=IISXKH3A1ngZGfFmBz_aSA \
   --form email=enno.rehling@gmail.com \
   --form file=@eressea.tgz \
   --form version="$VERSION" \