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

http://eressea.upb.de/mantis/view.php?id=1320

Browse source 
MACHEN 'Burg'
This commit is contained in:
Enno Rehling 2007-12-10 20:05:01 +00:00
parent e96e73a995
commit 85238c0d84
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/kernel/battle.c
View file

@ -701,11 +701,11 @@ select_armor(troop t, boolean shield)
const armor * a = t.fighter->armors; const armor * a = t.fighter->armors;
int geschuetzt = 0; int geschuetzt = 0;
/* Drachen benutzen keine Rüstungen */ /* dragons do not use armor */
if (!(u->race->battle_flags & BF_EQUIPMENT)) if (!(u->race->battle_flags & BF_EQUIPMENT))
return NULL; return NULL;
/* ... und Werwölfe auch nicht */ /* ... neither do werewolves */
if (fval(u, UFL_WERE)) { if (fval(u, UFL_WERE)) {
return NULL; return NULL;
} }

14
src/common/kernel/build.c
View file

@ -935,10 +935,20 @@ build_building(unit * u, const building_type * btype, int want, order * ord)
new_order = default_order(lang); new_order = default_order(lang);
} else if (n!=INT_MAX) { } else if (n!=INT_MAX) {
/* reduzierte restgröße */ /* reduzierte restgröße */
new_order = create_order(K_MAKE, lang, "%d '%s' %i", n-built, btname, b->no); const char * hasspace = strchr(btname, ' ');
if (hasspace) {
new_order = create_order(K_MAKE, lang, "%d \"%s\" %i", n-built, btname, b->no);
} else {
new_order = create_order(K_MAKE, lang, "%d %s %i", n-built, btname, b->no);
}
} else if (btname) { } else if (btname) {
/* Neues Haus, Befehl mit Gebäudename */ /* Neues Haus, Befehl mit Gebäudename */
new_order = create_order(K_MAKE, lang, "'%s' %i", btname, b->no); const char * hasspace = strchr(btname, ' ');
if (hasspace) {
new_order = create_order(K_MAKE, lang, "\"%s\" %i", btname, b->no);
} else {
new_order = create_order(K_MAKE, lang, "%s %i", btname, b->no);
}
} }
if (new_order) { if (new_order) {