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

This commit is contained in:
Enno Rehling 2014-06-29 13:29:23 -07:00
commit 16be68ada3
2 changed files with 2 additions and 2 deletions

View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_BUILD 676
#define VERSION_BUILD 677

View File

@ -393,7 +393,7 @@ void encounters(void)
region *r;
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;
unit *u;
for (u = r->units; u; u = u->next) {