From 251126054e7d7916fbae17333f842edab35dd528 Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Fri, 13 Nov 2015 00:50:54 +0100 Subject: [PATCH 1/4] add missing NULL check to in_safe_building --- src/kernel/building.c | 2 +- src/kernel/building.test.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kernel/building.c b/src/kernel/building.c index d4a7fbbbd..55005722e 100644 --- a/src/kernel/building.c +++ b/src/kernel/building.c @@ -666,7 +666,7 @@ void building_setregion(building * b, region * r) bool in_safe_building(unit *u1, unit *u2) { if (u1->building) { building * b = inside_building(u1); - if (b->type->flags & BTF_FORTIFICATION) { + if (b && b->type->flags & BTF_FORTIFICATION) { if (!u2->building) { return true; } diff --git a/src/kernel/building.test.c b/src/kernel/building.test.c index 4241e893f..f3e66e34d 100644 --- a/src/kernel/building.test.c +++ b/src/kernel/building.test.c @@ -410,7 +410,9 @@ static void test_safe_building(CuTest *tc) { CuAssertIntEquals(tc, true, in_safe_building(u1, u2)); u2->building = u1->building; CuAssertIntEquals(tc, true, in_safe_building(u1, u2)); - u1->building->size = 2; + u1->number = 2; + CuAssertIntEquals(tc, false, in_safe_building(u1, u2)); + u1->building->size = 3; CuAssertIntEquals(tc, false, in_safe_building(u1, u2)); test_cleanup(); } From 1562439ca90e454399ce5aaa9d77f552d1453312 Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Mon, 16 Nov 2015 03:22:19 +0100 Subject: [PATCH 2/4] Moved the description of skillpotion to another namespace Skillpotion isn't actually defined as a potion (or part of the alchemy-system), therefore the description needs to be moved to the namespace "iteminfo" to be found. --- res/core/de/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml index 2188b225c..3186dcc42 100644 --- a/res/core/de/strings.xml +++ b/res/core/de/strings.xml @@ -246,6 +246,10 @@ unharmed from every conflict, no enemy will lay hand on the bearer for one week. + + The recipe of this potion is a well kept secret. Some even say it couldn't be brewed by mere mortals. One thing is certain though, the drinker receives further insight into any learned skills, which furthers their progress towards the mastery of those skills. + Die Herstellung dieses Trunkes ist ein wohlgehütetes Geheimnis. Manche behaupten gar, von Sterblichen könne er gar nicht gebraut werden. Tatsache ist, dass er dem Trinkenden tiefere Einsicht in seine erlernten Talente gewährt, was ihn in der Meisterung dieser Talente voranbringt. + @@ -3648,10 +3652,6 @@ For a healing potion one takes the peel of a windbag and some bugleweed, stirr in some chopped elvendear and sprinkle it with the blossoms of an ice begonia. This has to cook through for four days, while a gapgrowth has to be added on the second day. Then one carefully scoops off the top layer of liquid. One such potion gives four men (or one man four times) a 50% chance to survive otherwise lethal wounds. The potion is automatically used in case of injury. Für einen Heiltrank nehme man die Schale eines Windbeutels und etwas Gurgelkraut, rühre eine kleingehacktes Elfenlieb dazu und bestreue alles mit den Blüten einer Eisblume. Dies muß vier Tage lang gären, wobei man am zweiten Tag einen Spaltwachs dazutun muß. Dann ziehe man vorsichtig den oben schwimmenden Saft ab. Ein solcher Trank gibt vier Männern (oder einem Mann vier mal) im Kampf eine Chance von 50%, sonst tödliche Wunden zu überleben. Der Trank wird von ihnen automatisch bei Verletzung angewandt. - - The recipe of this potion is a well kept secret. Some even say it couldn't be brewed by mere mortals. One thing is certain though, the drinker receives further insight into any learned skills, which furthers their progress towards the mastery of those skills. - Die Herstellung dieses Trunkes ist ein wohlgehütetes Geheimnis. Manche behaupten gar, von Sterblichen könne er gar nicht gebraut werden. Tatsache ist, dass er dem Trinkenden tiefere Einsicht in seine erlernten Talente gewährt, was ihn in der Meisterung dieser Talente voranbringt. - From d07f359acbf158c831ff7c7246fbfcec62287ad4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 16 Nov 2015 14:12:51 +0100 Subject: [PATCH 3/4] fix a minor warning, get ready for 3.7 release --- res/buildings/castle-2.xml | 2 +- res/buildings/castle.xml | 2 +- res/e3a/buildings.xml | 2 +- s/coverity | 1 + src/buildno.h | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/res/buildings/castle-2.xml b/res/buildings/castle-2.xml index f32b5f480..a54957415 100644 --- a/res/buildings/castle-2.xml +++ b/res/buildings/castle-2.xml @@ -1,5 +1,5 @@ - + diff --git a/res/buildings/castle.xml b/res/buildings/castle.xml index e4e295a71..9a63d7dc8 100644 --- a/res/buildings/castle.xml +++ b/res/buildings/castle.xml @@ -1,5 +1,5 @@ - + diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml index ef4ef4199..231596dc6 100644 --- a/res/e3a/buildings.xml +++ b/res/e3a/buildings.xml @@ -3,7 +3,7 @@ - + diff --git a/s/coverity b/s/coverity index 8a7748e31..0ade4a113 100755 --- a/s/coverity +++ b/s/coverity @@ -1,6 +1,7 @@ #!/bin/bash set -e VERSION="$1" +echo "submitting version $VERSION" shift DESC="$*" cd Debug diff --git a/src/buildno.h b/src/buildno.h index ecfc833e6..9dcd4a3e9 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 From bf969879cd8806ae7649d822e3b1f2d6837aeae8 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 16 Nov 2015 14:28:47 +0100 Subject: [PATCH 4/4] release version 3.7.1 --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 9dcd4a3e9..ecfc833e6 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 2 +#define VERSION_BUILD 1