From f6e37bd875dc3e713231d3361b0fe3073ee90fd5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 15 Feb 2015 18:27:26 +0100 Subject: [PATCH 1/2] bump build number --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index f26ec2251..decff2fd0 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 3 +#define VERSION_BUILD 4 From 58fae8e90d368434743bc82ea4f7d72a1d6816a9 Mon Sep 17 00:00:00 2001 From: CTD Date: Fri, 13 Feb 2015 16:22:52 +0100 Subject: [PATCH 2/2] Guard chance repaired MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Das muss auch in den master damit es in der nächsten Auswertung wieder richtig ist! --- src/move.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/move.c b/src/move.c index b935789be..14c305c11 100644 --- a/src/move.c +++ b/src/move.c @@ -919,17 +919,17 @@ static unit *bewegung_blockiert_von(unit * reisender, region * r) } if (guard) { prob += base_prob; /* 30% base chance */ - prob = +guard_count*guard_number_prob; + prob += guard_count*guard_number_prob; if (r->terrain == newterrain(T_GLACIER)) - prob = +region_type_prob * 2; + prob += region_type_prob * 2; if (r->terrain == newterrain(T_SWAMP)) - prob = +region_type_prob * 2; + prob += region_type_prob * 2; if (r->terrain == newterrain(T_MOUNTAIN)) - prob = +region_type_prob; + prob += region_type_prob; if (r->terrain == newterrain(T_VOLCANO)) - prob = +region_type_prob; + prob += region_type_prob; if (r->terrain == newterrain(T_VOLCANO_SMOKING)) - prob = +region_type_prob; + prob += region_type_prob; if (prob > 0 && chance(prob)) { return guard;