Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2014-06-29 21:51:41 +02:00
commit 2e4adddb8f
1 changed files with 1 additions and 1 deletions

View File

@ -393,7 +393,7 @@ void encounters(void)
region *r; region *r;
for (r = regions; r; r = r->next) { for (r = regions; r; r = r->next) {
if (!fval(r->terrain, SEA_REGION) && fval(r, RF_ENCOUNTER)) { if (fval(r->terrain, LAND_REGION) && fval(r, RF_ENCOUNTER)) {
int c = 0; int c = 0;
unit *u; unit *u;
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {