diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 4f6133cce..efd3f2c78 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -1091,7 +1091,7 @@ quit(void) continue; } } - +#ifdef REMOVENMRNEWBIE puts(" - beseitige Spieler, die sich nach der Anmeldung nicht " "gemeldet haben..."); @@ -1105,6 +1105,8 @@ quit(void) } } } +#endif + /* Clear away debris of destroyed factions */ puts(" - beseitige leere Einheiten und leere Parteien..."); @@ -2990,7 +2992,7 @@ setdefaults (void) case K_BIETE: case K_PIRACY: if (idle (u->faction)) { - set_string (&u->thisorder, locale_string(u->faction->locale, keywords[K_WORK])); + set_string (&u->thisorder, locale_string(u->faction->locale, "defaultorder")); break; } /* Ab hier Befehle, die auch eine idle @@ -3000,7 +3002,7 @@ setdefaults (void) case K_DRIVE: case K_MOVE: if(fval(u, FL_HUNGER)) { - set_string(&u->thisorder, locale_string(u->faction->locale, keywords[K_WORK])); + set_string(&u->thisorder, locale_string(u->faction->locale, "defaultorder")); } else { set_string(&u->thisorder, S->s); } @@ -3039,7 +3041,7 @@ setdefaults (void) } /* Attackiere sollte niemals Default werden */ if (igetkeyword(u->lastorder, u->faction->locale) == K_ATTACK) - set_string(&u->lastorder, locale_string(u->faction->locale, keywords[K_WORK])); + set_string(&u->lastorder, locale_string(u->faction->locale, "defaultorder")); } } diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index b3191130a..c6540c150 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -18,3 +18,4 @@ #define NEW_RESOURCEGROWTH 1 #define LARGE_CASTLES 1 #define GROWING_TREES 1 +#define REMOVENMRNEWBIE 1 diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h index 808027f0a..372333cac 100644 --- a/src/common/settings-vinyambar-classic.h +++ b/src/common/settings-vinyambar-classic.h @@ -18,3 +18,4 @@ #define NEW_RESOURCEGROWTH 0 #define LARGE_CASTLES 0 #define GROWING_TREES 0 +#define REMOVENMRNEWBIE 0