From db07cbed6b6ef1c926e276a961ff8e9264ba9281 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 6 May 2017 09:44:06 +0200 Subject: [PATCH 1/2] use correct type for PI (double). promote defines to platform-header. --- src/platform.h | 6 ++++++ src/util/rand.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/platform.h b/src/platform.h index fba2078bb..97d254e2d 100644 --- a/src/platform.h +++ b/src/platform.h @@ -48,4 +48,10 @@ char * strdup(const char *s); int mkdir(const char *pathname, int mode); #endif +/* do not use M_PI, use one of these instead: */ +#define PI_F 3.1415926535897932384626433832795F +#define PI_D 3.1415926535897932384626433832795 +#define PI_L 3.1415926535897932384626433832795L + + #endif diff --git a/src/util/rand.c b/src/util/rand.c index bd8543b9e..441461068 100644 --- a/src/util/rand.c +++ b/src/util/rand.c @@ -28,8 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include -#define PI_L 3.1415926535897932384626433832795L - int lovar(double xpct_x2) { int n = (int)(xpct_x2 * 500) + 1; @@ -51,10 +49,10 @@ double normalvariate(double mu, double sigma) if (phase == 0) { U = (rng_int() + 1.) / (RNG_RAND_MAX + 2.); V = rng_int() / (RNG_RAND_MAX + 1.); - Z = sqrt(-2 * log(U)) * sin(2 * PI_L * V); + Z = sqrt(-2 * log(U)) * sin(2 * PI_D * V); } else { - Z = sqrt(-2 * log(U)) * cos(2 * PI_L * V); + Z = sqrt(-2 * log(U)) * cos(2 * PI_D * V); } phase = 1 - phase; From 5dea221b8b70ba5c8644a1df03fb2a295128de05 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 6 May 2017 10:56:44 +0200 Subject: [PATCH 2/2] quick fix for intermittent spells --- scripts/tests/e2/init.lua | 2 +- scripts/tests/e2/spells.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/tests/e2/init.lua b/scripts/tests/e2/init.lua index 4b4fe7dd4..7fbc0eb95 100644 --- a/scripts/tests/e2/init.lua +++ b/scripts/tests/e2/init.lua @@ -1,3 +1,4 @@ +require 'tests.e2.spells' require 'tests.e2.buildings' require 'tests.e2.production' require 'tests.e2.adamantium' @@ -7,7 +8,6 @@ require 'tests.e2.e2features' require 'tests.e2.movement' require 'tests.e2.destroy' require 'tests.e2.guard' -require 'tests.e2.spells' require 'tests.e2.stealth' require 'tests.e2.items' require 'tests.items' diff --git a/scripts/tests/e2/spells.lua b/scripts/tests/e2/spells.lua index dad951293..fc1e3bc3b 100644 --- a/scripts/tests/e2/spells.lua +++ b/scripts/tests/e2/spells.lua @@ -8,6 +8,7 @@ function setup() eressea.settings.set("nmr.timeout", "0") eressea.settings.set("NewbieImmunity", "0") eressea.settings.set("rules.food.flags", "4") + eressea.settings.set("rules.peasants.growth.factor", "0") end function test_shapeshift() @@ -44,7 +45,7 @@ function test_raindance() u:clear_orders() u:add_order("ZAUBERE STUFE 1 Regentanz") assert_equal(0, r:get_resource("money")) - + process_orders() assert_equal(200, r:get_resource("money")) assert_equal(0, u:get_item("money"))