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

Fehlende "" um skill-namen

This commit is contained in:
Enno Rehling 2005-07-10 20:58:13 +00:00
parent e1dc630bcd
commit a96d3807a6
1 changed files with 70 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/gamecode/monster.c
View File

@ -88,7 +88,8 @@ monster_attack(unit * u, const unit * target)
if (is_waiting(u)) return NULL; if (is_waiting(u)) return NULL;
sprintf(zText, "%s %s", sprintf(zText, "%s %s",
locale_string(u->faction->locale, keywords[K_ATTACK]), unitid(target)); locale_string(u->faction->locale, keywords[K_ATTACK]),
unitid(target));
return parse_order(zText, u->faction->locale); return parse_order(zText, u->faction->locale);
} }
@ -324,7 +325,8 @@ monster_move(region * r, unit * u)
if (d == NODIRECTION) if (d == NODIRECTION)
return NULL; return NULL;
sprintf(buf, "%s %s", locale_string(u->faction->locale, keywords[K_MOVE]), locale_string(u->faction->locale, directions[d])); sprintf(buf, "%s %s", locale_string(u->faction->locale, keywords[K_MOVE]),
locale_string(u->faction->locale, directions[d]));
return parse_order(buf, u->faction->locale); return parse_order(buf, u->faction->locale);
} }
@ -480,7 +482,8 @@ monster_seeks_target(region *r, unit *u)
} }
assert(d != NODIRECTION ); assert(d != NODIRECTION );
sprintf(buf, "%s %s", locale_string(u->faction->locale, keywords[K_MOVE]), locale_string(u->faction->locale, directions[d])); sprintf(buf, "%s %s", locale_string(u->faction->locale, keywords[K_MOVE]),
locale_string(u->faction->locale, directions[d]));
return parse_order(buf, u->faction->locale); return parse_order(buf, u->faction->locale);
} }
@ -697,7 +700,7 @@ monster_learn(unit *u)
for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {
if (sv->level>0) { if (sv->level>0) {
if (++c == n) { if (++c == n) {
sprintf(buf, "%s %s", locale_string(lang, keywords[K_STUDY]), sprintf(buf, "%s \"%s\"", locale_string(lang, keywords[K_STUDY]),
skillname(sv->id, lang)); skillname(sv->id, lang));
return parse_order(buf, lang); return parse_order(buf, lang);
} }
@ -775,7 +778,8 @@ recruit_dracoids(unit * dragon, int size)
if (weapon->rtype->wtype->flags & WTF_MISSILE) un->status = ST_BEHIND; if (weapon->rtype->wtype->flags & WTF_MISSILE) un->status = ST_BEHIND;
else un->status = ST_FIGHT; else un->status = ST_FIGHT;
sprintf(buf, "%s \"%s\"", keywords[K_STUDY], skillname(weapon->rtype->wtype->skill, f->locale)); sprintf(buf, "%s \"%s\"", keywords[K_STUDY],
skillname(weapon->rtype->wtype->skill, f->locale));
new_order = parse_order(buf, default_locale); new_order = parse_order(buf, default_locale);
#ifdef LASTORDER #ifdef LASTORDER
set_order(&un->lastorder, new_order); set_order(&un->lastorder, new_order);
@ -870,7 +874,8 @@ plan_dragon(unit * u)
} }
} }
if (long_order==NULL) { if (long_order==NULL) {
sprintf(buf, "%s \"%s\"", keywords[K_STUDY], skillname(SK_OBSERVATION, u->faction->locale)); sprintf(buf, "%s \"%s\"", keywords[K_STUDY],
skillname(SK_OBSERVATION, u->faction->locale));
long_order = parse_order(buf, default_locale); long_order = parse_order(buf, default_locale);
} }
return long_order; return long_order;
@ -953,7 +958,8 @@ plan_monsters(void)
* zu bewachen: */ * zu bewachen: */
if (u->race->bonus[SK_WEAPONLESS] != -99) { if (u->race->bonus[SK_WEAPONLESS] != -99) {
if (eff_skill(u, SK_WEAPONLESS, u->region) < 1) { if (eff_skill(u, SK_WEAPONLESS, u->region) < 1) {
sprintf(buf, "%s %s", locale_string(f->locale, keywords[K_STUDY]), sprintf(buf, "%s \"%s\"",
locale_string(f->locale, keywords[K_STUDY]),
skillname(SK_WEAPONLESS, f->locale)); skillname(SK_WEAPONLESS, f->locale));
long_order = parse_order(buf, f->locale); long_order = parse_order(buf, f->locale);
} }