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

bugfixes in verschiedenen messages und in err_message

Browse source
This commit is contained in:
Enno Rehling 2001-04-22 23:31:15 +00:00
parent df88ebdf83
commit 980c7f69f8
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/kernel/message.c
View file

@ -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 && !isalnum(*ic)) ic++;
while (*ic) { while (*ic) {
void * v = va_arg(marker, void *); void * v = va_arg(marker, void *);
oc = buffer;
while (isalnum(*ic)) *oc++ = *ic++; while (isalnum(*ic)) *oc++ = *ic++;
*oc = '\0'; *oc = '\0';
arg_set(args, mtype, buffer, v); 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 && !isalnum(*ic)) ic++;
while (*ic) { while (*ic) {
void * v = va_arg(marker, void *); void * v = va_arg(marker, void *);
oc = buffer;
while (isalnum(*ic)) *oc++ = *ic++; while (isalnum(*ic)) *oc++ = *ic++;
*oc = '\0'; *oc = '\0';
arg_set(args, mtype, buffer, v); arg_set(args, mtype, buffer, v);

2
src/res/de/messages.xml
View file

@ -35,7 +35,7 @@
</type> </type>
<locale name="de"> <locale name="de">
<nr section="production"> <nr section="production">
<text>"$unit($unit) in $region($region): '$command' - Dazu braucht man das Talent $skill"</text> <text>"$unit($unit) in $region($region): '$command' - Dazu braucht man das Talent $skill($skill)"</text>
</nr> </nr>
</locale> </locale>
</message> </message>

6
src/res/en/strings.txt
View file

@ -55,7 +55,7 @@ tunnel;en;tunnel
site;en;foundation site;en;foundation
fortification;en;fortification fortification;en;fortification
tower;en;tower tower;en;tower
castle;en;castle castle;en;stronghold
fortress;en;fortress fortress;en;fortress
citadel;en;citadel citadel;en;citadel
@ -156,8 +156,8 @@ laensword;en;laen sword
laensword_p;en;laen swords laensword_p;en;laen swords
lance;en;lance lance;en;lance
lance_p;en;lances lance_p;en;lances
log;en;log log;en;wood
log_p;en;logs log_p;en;wood
magicbag;en;magic bag magicbag;en;magic bag
magicherbbag;en;bag of conservation magicherbbag;en;bag of conservation
mallorn;en;mallorn mallorn;en;mallorn