0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix 8522.

Browse source 
removed user_description generation unless generate_description set
This commit is contained in:
John W. C. McNabb 2007-05-31 01:39:23 +00:00
parent b7a258a033
commit b9c38029bf
4 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/core/names.cfg
View file

@ -47,11 +47,6 @@ male_names= _ "Kraag,Gillan,Gisharri,Karigan,Gron ih,Krenli,Kegrid,Mah Toa,Grish
female_names= _ "Velisp,Valnitt,Vushtin,Eshyi,Dell,Vallin,Demla,Auuglann,Auginet Ka,Vellin Ka,Omage,Orriday,Weshter,Wilniss,Werra,Damell,Dinsill,Orridan,Oshibi,Valnirra,Olath,Omagrra,Ashijt,Alen Ka,Alinash Mal,Orra Ka"
#enddef
#define UNDEAD_NAMES
male_names= _ " "
#enddef
#define VILLAGE_NAMES
male_names= _ "Ox,Hol,Il,Del,El,York,Corn,Hel,Sel,Sil,Sal,Bal,Water,Sen,Sed,Hex,Hox,Fox,Bal,Wet,Earl,Fren,Kin,Tal,Gel,Nam,Sam,Olf,Old,New,Ol,Nes,Cam,Rook,Rock,Oul"
#enddef

1
data/core/units.cfg
View file

@ -80,7 +80,6 @@
num_traits=1
ignore_global_traits=yes
{TRAIT_UNDEAD}
{UNDEAD_NAMES}
[/race]
[race]

8
src/unit.cpp
View file

@ -279,10 +279,6 @@ unit::unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map,
underlying_description_ = buf;
}
if(custom_unit_description_.empty()){
custom_unit_description_=type()->language_name();
}
unrenamable_ = false;
anim_ = NULL;
getsHit_=0;
@ -327,10 +323,6 @@ unit::unit(const unit_type* t, int side, bool use_traits, bool dummy_unit, unit_
underlying_description_ = buf;
}
if(custom_unit_description_.empty()){
custom_unit_description_=type()->language_name();
}
unrenamable_ = false;
next_idling_ = 0;
frame_begin_time_ = 0;

2
src/unit.hpp
View file

@ -76,7 +76,7 @@ class unit
const std::string& name() const { if (description_.empty()) return language_name(); else return description_; }
void rename(const std::string& name) { if (!unrenamable_) custom_unit_description_ = name; }
// the unit type name
const std::string& description() const { return (custom_unit_description_ != "") ? custom_unit_description_ : description_; }
const std::string& description() const { return (custom_unit_description_); }
const std::string& underlying_description() const { return underlying_description_; }
const t_string& language_name() const { return language_name_; }
const std::string& undead_variation() const { return undead_variation_; }