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

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

This commit is contained in:
Enno Rehling 2014-06-29 13:29:23 -07:00
parent 28d2984bc8 2e4adddb8f
commit 16be68ada3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build.h
View File

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

2
src/randenc.c
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) {