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

road_override wieder rein

Browse source
This commit is contained in:
Enno Rehling 2001-02-04 08:42:36 +00:00
parent d69f32b668
commit 61101dca34
4 changed files with 54 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/attributes/attributes.c
View file

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: attributes.c,v 1.4 2001/02/02 08:40:44 enno Exp $ * $Id: attributes.c,v 1.5 2001/02/04 08:42:36 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -32,12 +32,13 @@
* library initialization * library initialization
*/ */
extern attrib_type at_roads_override;
void void
init_attributes(void) init_attributes(void)
{ {
at_register(&at_orcification); at_register(&at_orcification);
at_register(&at_roads_override);
/* at_iceberg */ /* at_iceberg */
init_iceberg(); init_iceberg();
/* at_key */ /* at_key */

12
src/common/gamecode/report.c
View file

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: report.c,v 1.6 2001/02/03 13:45:30 enno Exp $ * $Id: report.c,v 1.7 2001/02/04 08:38:14 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -863,6 +863,10 @@ see_border(border * b, faction * f, region * r)
return cs; return cs;
} }
attrib_type at_roads_override = {
"roads_override", NULL, NULL, NULL, &a_writestring, &a_readstring
};
static void static void
describe(FILE * F, region * r, int partial, faction * f) describe(FILE * F, region * r, int partial, faction * f)
{ {
@ -1025,6 +1029,11 @@ describe(FILE * F, region * r, int partial, faction * f)
} }
if (!is_cursed(r->attribs, C_REGCONF, 0)) { if (!is_cursed(r->attribs, C_REGCONF, 0)) {
attrib *a_do = a_find(r->attribs, &at_roads_override);
if(a_do) {
scat(" ");
scat((char *)a_do->data.v);
} else {
int nrd = 0; int nrd = 0;
/* Nachbarregionen, die gesehen werden, ermitteln */ /* Nachbarregionen, die gesehen werden, ermitteln */
@ -1063,6 +1072,7 @@ describe(FILE * F, region * r, int partial, faction * f)
dh = 1; dh = 1;
} }
if (dh) scat("."); if (dh) scat(".");
}
rnl(F); rnl(F);
rparagraph(F, buf, 0, 0); rparagraph(F, buf, 0, 0);
} else { } else {

2
src/enno.mk
View file

@ -2,7 +2,7 @@
## enable some new features in the source: ## enable some new features in the source:
# #
# CONVERT_TRIGGERS = 1 CONVERT_TRIGGERS = 1
CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS

5
src/eressea/attributes.c
View file

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: attributes.c,v 1.4 2001/02/03 13:45:34 enno Exp $ * $Id: attributes.c,v 1.5 2001/02/04 08:38:14 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -27,10 +27,11 @@
/* util includes */ /* util includes */
#include <attrib.h> #include <attrib.h>
extern attrib_type at_roads_override;
void void
init_attributes(void) init_attributes(void)
{ {
at_register(&at_roads_override);
/* at_iceberg */ /* at_iceberg */
init_iceberg(); init_iceberg();
/* at_key */ /* at_key */