From 980c7f69f8a6ee18d4fd304b8ca7c9818963aa1e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 22 Apr 2001 23:31:15 +0000 Subject: [PATCH] bugfixes in verschiedenen messages und in err_message --- src/common/kernel/message.c | 2 ++ src/res/de/messages.xml | 2 +- src/res/en/strings.txt | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/kernel/message.c b/src/common/kernel/message.c index cb1296fc4..ff3fc6fac 100644 --- a/src/common/kernel/message.c +++ b/src/common/kernel/message.c @@ -279,6 +279,7 @@ msg_error(const struct unit * u, const char * cmd, const char * name, const char while (*ic && !isalnum(*ic)) ic++; while (*ic) { void * v = va_arg(marker, void *); + oc = buffer; while (isalnum(*ic)) *oc++ = *ic++; *oc = '\0'; arg_set(args, mtype, buffer, v); @@ -309,6 +310,7 @@ msg_message(const char * name, const char* sig, ...) while (*ic && !isalnum(*ic)) ic++; while (*ic) { void * v = va_arg(marker, void *); + oc = buffer; while (isalnum(*ic)) *oc++ = *ic++; *oc = '\0'; arg_set(args, mtype, buffer, v); diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml index 9c6de6c42..035b7dbe5 100644 --- a/src/res/de/messages.xml +++ b/src/res/de/messages.xml @@ -35,7 +35,7 @@ - "$unit($unit) in $region($region): '$command' - Dazu braucht man das Talent $skill" + "$unit($unit) in $region($region): '$command' - Dazu braucht man das Talent $skill($skill)" diff --git a/src/res/en/strings.txt b/src/res/en/strings.txt index 5718b03e5..5db4d396d 100644 --- a/src/res/en/strings.txt +++ b/src/res/en/strings.txt @@ -55,7 +55,7 @@ tunnel;en;tunnel site;en;foundation fortification;en;fortification tower;en;tower -castle;en;castle +castle;en;stronghold fortress;en;fortress citadel;en;citadel @@ -156,8 +156,8 @@ laensword;en;laen sword laensword_p;en;laen swords lance;en;lance lance_p;en;lances -log;en;log -log_p;en;logs +log;en;wood +log_p;en;wood magicbag;en;magic bag magicherbbag;en;bag of conservation mallorn;en;mallorn