From d86835900f081efca7896e9cfb635ab9b0e0be75 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 18 Feb 2007 10:32:39 +0000 Subject: [PATCH] argh. lomem settings falschrum --- src/common/kernel/border.c | 11 ++++++++--- src/eressea/server.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/common/kernel/border.c b/src/common/kernel/border.c index 0c220b12f..c25c65902 100644 --- a/src/common/kernel/border.c +++ b/src/common/kernel/border.c @@ -469,10 +469,15 @@ b_validroad(const border * b) static boolean b_rvisibleroad(const border * b, const region * r) { - int x = b->data.i; + int x = b->data.i; x = (r==b->from)?b->data.sa[0]:b->data.sa[1]; - if (x==0) return false; - return (boolean)(b->to==r || b->from==r); + if (x==0) { + return false; + } + if (b->to!=r && b->from!=r) { + return false; + } + return true; } border_type bt_road = { diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp index d93e11b02..9a261739e 100644 --- a/src/eressea/server.cpp +++ b/src/eressea/server.cpp @@ -573,7 +573,7 @@ load_inifile(const char * filename) if (d) { const char * str; - lomem = iniparser_getint(d, "eressea:lomem", lomem)?0:1; + lomem = iniparser_getint(d, "eressea:lomem", lomem)?1:0; quiet = iniparser_getint(d, "eressea:verbose", 0)?0:1; str = iniparser_getstr(d, "eressea:run"); if (str) luafile = str;