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=712

Browse source 
rusty shields disappear because of stupid reverse_lookup code.

removed a bit of dead code.
This commit is contained in:
Enno Rehling 2005-10-02 13:21:29 +00:00
parent dd9c6e50c2
commit 2d2ed6f7ea
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -382,11 +382,6 @@ destroy_cmd(unit * u, struct order * ord)
return 0; return 0;
} }
#if 0
con = b->type->construction;
size = b->size;
#endif
if(n >= b->size) { if(n >= b->size) {
/* destroy completly */ /* destroy completly */
/* all units leave the building */ /* all units leave the building */
@ -411,11 +406,6 @@ destroy_cmd(unit * u, struct order * ord)
return 0; return 0;
} }
#if 0
con = sh->type->construction;
size = (sh->size * DAMAGE_SCALE - sh->damage) / DAMAGE_SCALE;
#endif
if (rterrain(r) == T_OCEAN) { if (rterrain(r) == T_OCEAN) {
cmistake(u, ord, 14, MSG_EVENT); cmistake(u, ord, 14, MSG_EVENT);
return 0; return 0;

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

@ -1101,7 +1101,7 @@ static t_item itemdata[MAXITEMS] = {
IS_PRODUCT, SK_WEAPONSMITH, 3, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL IS_PRODUCT, SK_WEAPONSMITH, 3, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
}, },
{ /* I_RUSTY_SHIELD 42 */ { /* I_RUSTY_SHIELD 42 */
{"Rostiges Schild", "Rostige Schilde", "Rostiges Schild", "Rostige Schilde"}, {"Rostiger Schild", "Rostige Schilde", "Rostiges Schild", "Rostige Schilde"},
IS_PRODUCT, SK_ARMORER, 2, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL IS_PRODUCT, SK_ARMORER, 2, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
}, },
{ /* I_RUSTY_CHAIN_MAIL */ { /* I_RUSTY_CHAIN_MAIL */

3
src/common/util/language.c
View file

@ -176,7 +176,8 @@ reverse_lookup(const locale * lang, const char * str)
} }
} }
} }
log_warning(("could not do a reverse_lookup for \"%s\" in locale %s\n", str, lang->name)); log_error(("could not do a reverse_lookup for \"%s\" in locale %s\n", str, lang->name));
assert(!"failed to do a reverse_lookup");
} }
return str; return str;
} }