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

Linefeed, Mapper-Changes

This commit is contained in:
Christian Schlittchen 2002-09-29 19:13:38 +00:00
parent 8c81df6847
commit 4371ebab96
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/util/nrmessage.h
View File

@ -35,4 +35,5 @@ extern const char * nr_section(const struct message *msg);
* fogblock:movement:0 * fogblock:movement:0
* $unit($unit) konnte von $region($region) nicht nach $direction($direction) ausreisen, der Nebel war zu dicht. * $unit($unit) konnte von $region($region) nicht nach $direction($direction) ausreisen, der Nebel war zu dicht.
* unit:unit region:region direction:int * unit:unit region:region direction:int
*/ */

2
src/mapper/map_units.c
View File

@ -82,7 +82,7 @@ make_new_unit(region * r)
WINDOW *win; WINDOW *win;
char *fac_nr36; char *fac_nr36;
int i, p, anz, q, y; int i, p, anz, q, y;
win = openwin(SX - 10, 8, "< Neue Einheit erschaffen >"); win = openwin(SX - 10, 17, "< Neue Einheit erschaffen >");
if (r->units) if (r->units)
p = r->units->faction->no; p = r->units->faction->no;

36
src/mapper/mapper.c
View File

@ -606,10 +606,12 @@ modify_block(void)
tagregion *t; tagregion *t;
char *name = NULL; char *name = NULL;
int div = 0; int div = 0;
int mal = 0;
struct rawmaterial *res;
win = openwin(70, 4, "< Tag-Regionen modifizieren >"); win = openwin(70, 4, "< Tag-Regionen modifizieren >");
wmove(win, 1, 2); wmove(win, 1, 2);
wAddstr("Name, Peasants, Horses, Silver, Chaos (n/p/h/s/c,q)?"); wAddstr("Name, Peasants, Horses, Silver, Chaos, noResources, Mallorn (n/p/h/s/c/r/m,q)?");
wrefresh(win); wrefresh(win);
c = getch(); c = getch();
if (c == 'q') { if (c == 'q') {
@ -634,6 +636,16 @@ modify_block(void)
case 'p': case 'p':
div = atoi(my_input(win, 2, 2, "Divisor: ", "1")); div = atoi(my_input(win, 2, 2, "Divisor: ", "1"));
break; break;
case 'm':
wmove(win, 2, 2);
wAddstr("Mallorn (s)etzen oder (l)öschen?");
wrefresh(win);
if (getch() == 's') {
mal = 1;
} else {
mal = 0;
}
break;
} }
for (t=Tagged; t; t=t->next) { for (t=Tagged; t; t=t->next) {
@ -653,6 +665,28 @@ modify_block(void)
case 's': case 's':
rsetmoney(r, production(r)*10+rand()%(production(r)*10)); rsetmoney(r, production(r)*10+rand()%(production(r)*10));
break; break;
case 'r':
for (res=r->resources;res;res=res->next) {
const item_type * itype = resource2item(res->type->rtype);
if(itype == olditemtype[I_IRON]) {
res->amount = -1;
res->level = -1;
} else if(itype == olditemtype[I_LAEN]) {
res->amount = -1;
res->level = -1;
} else if(itype == olditemtype[I_STONE]) {
res->amount = -1;
res->level = -1;
}
}
break;
case 'm':
if(mal == 1) {
fset(r, RF_MALLORN);
} else {
freset(r, RF_MALLORN);
}
break;
} }
} }
if (c == 'c') { if (c == 'c') {