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

- makemonster raus, macht Blödsinn

Browse source
This commit is contained in:
Christian Schlittchen 2001-12-23 09:23:53 +00:00
parent e019960a69
commit 1528d7d1a5
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/kernel/eressea.c
View file

@ -1300,7 +1300,8 @@ findfaction (int n)
} }
} }
#endif /* FUZZY_BASE36 */ #endif /* FUZZY_BASE36 */
if (n==MONSTER_FACTION) return makemonsters(); /* Gibt komische Seiteneffekte hier! */
/* if (n==MONSTER_FACTION) return makemonsters(); */
return NULL; return NULL;
} }
@ -1671,7 +1672,7 @@ create_unit(region * r, faction * f, int number, const struct race *urace, int i
assert(f->alive); assert(f->alive);
u_setfaction(u, f); u_setfaction(u, f);
set_string(&u->thisorder, ""); set_string(&u->thisorder, "");
set_string(&u->lastorder, LOC(u->faction->locale, keywords[K_WORK])); set_string(&u->lastorder, LOC(u->faction->locale, "defaultorder"));
u_seteffstealth(u, -1); u_seteffstealth(u, -1);
u->race = urace; u->race = urace;
u->irace = urace; u->irace = urace;

25
src/eressea/korrektur.c
View file

@ -2707,6 +2707,18 @@ randomized_resources(void)
} }
#endif #endif
static int
fix_idleout(void)
{
faction *f;
f = findfaction(0);
fset(f, FL_NOIDLEOUT);
f = findfaction(atoi36("muse"));
fset(f, FL_NOIDLEOUT);
return 0;
}
void void
korrektur(void) korrektur(void)
{ {
@ -2786,22 +2798,11 @@ korrektur(void)
#endif #endif
do_once("grat", fix_ratfamiliar()); do_once("grat", fix_ratfamiliar());
do_once("fdmd", fix_demand()); do_once("fdmd", fix_demand());
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH
do_once("rndr", randomized_resources()); do_once("rndr", randomized_resources());
#endif #endif
{ do_once("idlo", fix_idleout());
/* Test der Message-Funktion. Ist leider noch nicht
* Plane-übergreifend, deshalb die Waldelfen. */
faction *f = findfaction(atoi36("1"));
if(f) {
attrib *permission = a_find(f->attribs, &at_permissions);
if(!permission) permission = a_add(&f->attribs, a_new(&at_permissions));
a_add((attrib**)&permission->data.v, make_key(atoi36("gmmsgr")));
a_add((attrib**)&permission->data.v, make_key(atoi36("gmmsgu")));
}
}
/* trade_orders(); */ /* trade_orders(); */
if (global.data_version < NEWROAD_VERSION) { if (global.data_version < NEWROAD_VERSION) {

4
src/mapper/mapper.c
View file

@ -422,7 +422,9 @@ drawmap(boolean maponly) {
addch(' '); addch(' ');
if (r) { if (r) {
#ifdef COLOR
int rc = RegionColor(r); int rc = RegionColor(r);
#endif
if ((hl == -2 && r->units) || if ((hl == -2 && r->units) ||
(hl == -3 && r->buildings) || (hl == -3 && r->buildings) ||
(hl == -4 && r->ships) || (hl == -4 && r->ships) ||
@ -436,7 +438,9 @@ drawmap(boolean maponly) {
else if (is_tagged(r)) else if (is_tagged(r))
addch(rs | A_BOLD); addch(rs | A_BOLD);
else { else {
#ifdef COLOR
attrset(rc | A_NORMAL); attrset(rc | A_NORMAL);
#endif
addch(rs); addch(rs);
attrset(A_NORMAL); attrset(A_NORMAL);
} }