Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix drowning (it's not dependeing on icebergs).

This commit is contained in:
Enno Rehling 2017-11-05 20:52:04 +01:00
parent 5b70d605ce
commit c597bebb8b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/tests/common.lua
View File

@ -807,7 +807,6 @@ end
function test_swim_and_survive() function test_swim_and_survive()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = create_faction('human') local f = create_faction('human')
f.nam = "chaos"
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
process_orders() process_orders()
r.terrain = "ocean" r.terrain = "ocean"

11
src/randenc.c
View File

@ -457,10 +457,6 @@ static void melt_iceberg(region * r)
/* in Ozean wandeln */ /* in Ozean wandeln */
terraform_region(r, newterrain(T_OCEAN)); terraform_region(r, newterrain(T_OCEAN));
/* Einheiten, die nicht schwimmen k<>nnen oder in Schiffen sind,
* ertrinken */
drown(r);
} }
static void move_iceberg(region * r) static void move_iceberg(region * r)
@ -755,12 +751,8 @@ static void demon_skillchanges(void)
*/ */
static void icebergs(void) static void icebergs(void)
{ {
region *r;
create_icebergs(); create_icebergs();
move_icebergs(); move_icebergs();
for (r = regions; r; r = r->next) {
drown(r);
}
} }
#define HERBS_ROT /* herbs owned by units have a chance to rot. */ #define HERBS_ROT /* herbs owned by units have a chance to rot. */
@ -809,6 +801,9 @@ void randomevents(void)
if (config_get_int("modules.icebergs", 0)) { if (config_get_int("modules.icebergs", 0)) {
icebergs(); icebergs();
} }
for (r = regions; r; r = r->next) {
drown(r);
}
godcurse(); godcurse();
orc_growth(); orc_growth();
demon_skillchanges(); demon_skillchanges();