diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 4bbe5e562..c01f67c7a 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -226,8 +226,7 @@ restart(unit *u, int race) faction *f = addplayer(u->region, u->faction->email, race)->faction; f->magiegebiet = u->faction->magiegebiet; f->options = u->faction->options; - assert(u->faction->locale); - f->locale = strdup(u->faction->locale); + f->locale = u->faction->locale; destroyfaction(u->faction); } diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index b9ac74a8b..43859b746 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -3402,6 +3402,14 @@ eval_skill(struct opstack ** stack, const void * userdata) int sk = opop(stack, int); const char * c = skillname(sk, report->locale); opush(stack, strcpy(balloc(strlen(c)+1), c)); +} + +static void +eval_int36(struct opstack ** stack, const void * userdata) +{ + int i = opop(stack, int); + const char * c = itoa36(i); + opush(stack, strcpy(balloc(strlen(c)+1), c)); unused(userdata); } @@ -3417,4 +3425,5 @@ report_init(void) add_function("building", &eval_building); add_function("skill", &eval_skill); add_function("direction", &eval_direction); + add_function("int36", &eval_int36); } diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c index eee8f2c8e..25999e2e6 100644 --- a/src/common/kernel/karma.c +++ b/src/common/kernel/karma.c @@ -243,6 +243,7 @@ struct fspecialdata fspecials[MAXFACTIONSPECIALS] = { 100 }, /* TODO: is_undead() und Sonderbehandlungen von Untoten */ + /* in dieser Form ultimative Eigenschaft für Orks */ { "Untot", "Personen einer Partei mit dieser Eigenschaft bekommen automatisch doppelt "