diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index 6d71baac8..bbc14c21f 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -12,7 +12,6 @@ without prior permission by the authors of Eressea. #include "creport.h" /* tweakable features */ -#define ENCODE_SPECIAL 1 #define RENDER_CRMESSAGES #define BUFFERSIZE 32768 #define RESOURCECOMPAT @@ -321,10 +320,8 @@ cr_region(variant var, char * buffer, const void * userdata) region * r = (region *)var.v; if (r) { plane * p = r->planep; - if (!p || !(p->flags & PFL_NOCOORDS)) { - sprintf(buffer, "%d %d %d", region_x(r, report), region_y(r, report), p?p->id:0); - return 0; - } + sprintf(buffer, "%d %d %d", region_x(r, report), region_y(r, report), p?p->id:0); + return 0; } return -1; } @@ -1132,12 +1129,7 @@ cr_output_region(FILE * F, report_context * ctx, seen_region * sr) fprintf(F, "REGION %d %d\n", region_x(r, f), region_y(r, f)); } } else { -#if ENCODE_SPECIAL - if (r->planep->flags & PFL_NOCOORDS) fprintf(F, "SPEZIALREGION %d %d\n", encode_region(f, r), r->planep->id); -#else - if (r->planep->flags & PFL_NOCOORDS) continue; -#endif - else fprintf(F, "REGION %d %d %d\n", region_x(r, f), region_y(r, f), r->planep->id); + fprintf(F, "REGION %d %d %d\n", region_x(r, f), region_y(r, f), r->planep->id); } fprintf(F, "%d;id\n", r->uid); if (r->land) { @@ -1416,8 +1408,7 @@ report_computer(const char * filename, report_context * ctx, const char * charse for (bm=f->battles;bm;bm=bm->next) { if (!bm->r->planep) fprintf(F, "BATTLE %d %d\n", region_x(bm->r, f), region_y(bm->r, f)); else { - if (bm->r->planep->flags & PFL_NOCOORDS) fprintf(F, "BATTLESPEC %d %d\n", encode_region(f, bm->r), bm->r->planep->id); - else fprintf(F, "BATTLE %d %d %d\n", region_x(bm->r, f), region_y(bm->r, f), bm->r->planep->id); + fprintf(F, "BATTLE %d %d %d\n", region_x(bm->r, f), region_y(bm->r, f), bm->r->planep->id); } cr_output_messages(F, bm->msgs, f); } diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 3cf07dcc4..c862bc5fe 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -1374,9 +1374,7 @@ report_template(const char * filename, report_context * ctx, const char * charse rps_nowrap(F, ""); rnl(F); pl = getplane(r); - if (pl && fval(pl, PFL_NOCOORDS)) { - sprintf(buf, "%s; %s", LOC(f->locale, parameters[P_REGION]), rname(r, f->locale)); - } else if (pl && pl->id != 0) { + if (pl && pl->id != 0) { sprintf(buf, "%s %d,%d,%d ; %s", LOC(f->locale, parameters[P_REGION]), region_x(r,f), region_y(r,f), pl->id, rname(r, f->locale)); } else { diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c index fbe732bf8..47adc45ff 100644 --- a/src/common/gamecode/xmlreport.c +++ b/src/common/gamecode/xmlreport.c @@ -16,10 +16,6 @@ #include #include "xmlreport.h" -/* tweakable features */ -#define ENCODE_SPECIAL 1 -#define RENDER_CRMESSAGES - #define XML_ATL_NAMESPACE (const xmlChar *) "http://www.eressea.de/XML/2008/atlantis" #define XML_XML_LANG (const xmlChar *) "lang" diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c index 4375f052a..f33720276 100644 --- a/src/common/kernel/move.c +++ b/src/common/kernel/move.c @@ -1643,14 +1643,8 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep) assert(sh == u->ship || !"ship has sunk, but we didn't notice it"); if (fval(next_point->terrain, FORBIDDEN_REGION)) { - plane *pl = getplane(next_point); - if (pl && fval(pl, PFL_NOCOORDS)) { - ADDMSG(&f->msgs, msg_message("sailforbiddendir", - "ship direction", sh, dir)); - } else { - ADDMSG(&f->msgs, msg_message("sailforbidden", - "ship region", sh, next_point)); - } + ADDMSG(&f->msgs, msg_message("sailforbidden", + "ship region", sh, next_point)); break; } diff --git a/src/common/kernel/plane.h b/src/common/kernel/plane.h index 996b5ec70..47e09e854 100644 --- a/src/common/kernel/plane.h +++ b/src/common/kernel/plane.h @@ -24,7 +24,7 @@ extern "C" { #endif -#define PFL_NOCOORDS 1 +#define PFL_NOCOORDS 1 /* not in use */ #define PFL_NORECRUITS 2 #define PFL_NOALLIANCES 4 #define PFL_LOWSTEALING 8 diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index e81248c1c..22cdeede3 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -116,13 +116,8 @@ write_regionname(const region * r, const faction * f, char * buffer, size_t size if (r==NULL) { strcpy(buf, "(null)"); } else { - plane *pl = r->planep; - if (pl && fval(pl, PFL_NOCOORDS)) { - strncpy(buf, rname(r, lang), size); - } else { - snprintf(buf, size, "%s (%d,%d)", rname(r, lang), - region_x(r, f), region_y(r, f)); - } + snprintf(buf, size, "%s (%d,%d)", rname(r, lang), + region_x(r, f), region_y(r, f)); } buf[size-1] = 0; return buffer; diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c index 61ec7397a..a03b7c49e 100644 --- a/src/common/kernel/reports.c +++ b/src/common/kernel/reports.c @@ -1621,9 +1621,7 @@ f_regionid(const region * r, const faction * f, char * buffer, size_t size) plane * pl = r->planep; strncpy(buffer, rname(r, f->locale), size); buffer[size-1]=0; - if (pl==NULL || !fval(pl, PFL_NOCOORDS)) { - sprintf(buffer+strlen(buffer), " (%d,%d%s%s)", region_x(r,f), region_y(r,f), pl?",":"", pl?pl->name:""); - } + sprintf(buffer+strlen(buffer), " (%d,%d%s%s)", region_x(r,f), region_y(r,f), pl?",":"", pl?pl->name:""); } return strlen(buffer); } diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c index a163cd9b2..ce2f4c421 100644 --- a/src/common/modules/museum.c +++ b/src/common/modules/museum.c @@ -49,7 +49,7 @@ #include #include -#define PFL_MUSEUM PFL_NOMONSTERS | PFL_NOCOORDS | PFL_NORECRUITS | PFL_NOGIVE | PFL_NOATTACK | PFL_NOTERRAIN | PFL_NOMAGIC | PFL_NOSTEALTH | PFL_NOTEACH | PFL_NOBUILD | PFL_NOFEED +#define PFL_MUSEUM PFL_NOMONSTERS | PFL_NORECRUITS | PFL_NOGIVE | PFL_NOATTACK | PFL_NOTERRAIN | PFL_NOMAGIC | PFL_NOSTEALTH | PFL_NOTEACH | PFL_NOBUILD | PFL_NOFEED attrib_type at_museumexit = { "museumexit", NULL, NULL, NULL, a_writeshorts, a_readshorts diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index c486e9d17..802661665 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -523,7 +523,6 @@ fix_astralplane(void) if (astralplane==NULL || monsters==NULL) return 0; - freset(astralplane, PFL_NOCOORDS); freset(astralplane, PFL_NOFEED); set_ursprung(monsters, astralplane->id, 0, 0);