Author: silene
Date: Thu May 21 18:21:18 2009
New Revision: 35793
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35793&view=rev
Log:
Merged unit::ability_tooltips and unit::unit_ability_tooltips.
Modified:
trunk/src/dialogs.cpp
trunk/src/generate_report.cpp
trunk/src/unit.hpp
trunk/src/unit_abilities.cpp
Modified: trunk/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.cpp?rev=35793&r1=35792&r2=35793&view=diff
==============================================================================
--- trunk/src/dialogs.cpp (original)
+++ trunk/src/dialogs.cpp Thu May 21 18:21:18 2009
@@ -884,7 +884,7 @@
det.traits = u.traits_description();
//we filter to remove the tooltips (increment by 2)
- const std::vector<std::string>& abilities = u.unit_ability_tooltips();
+ const std::vector<std::string> &abilities = u.ability_tooltips(true);
for(std::vector<std::string>::const_iterator a = abilities.begin();
a != abilities.end(); a+=2) {
det.abilities.push_back(*a);
Modified: trunk/src/generate_report.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/generate_report.cpp?rev=35793&r1=35792&r2=35793&view=diff
==============================================================================
--- trunk/src/generate_report.cpp (original)
+++ trunk/src/generate_report.cpp Thu May 21 18:21:18 2009
@@ -128,7 +128,7 @@
case UNIT_ABILITIES: {
report res;
std::stringstream tooltip;
- const std::vector<std::string> &abilities =
u->ability_tooltips(displayed_unit_hex);
+ const std::vector<std::string> &abilities =
u->ability_tooltips();
for(std::vector<std::string>::const_iterator i =
abilities.begin(); i != abilities.end(); ++i) {
str << gettext(i->c_str());
if(i+2 != abilities.end())
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=35793&r1=35792&r2=35793&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Thu May 21 18:21:18 2009
@@ -299,8 +299,7 @@
unit_ability_list get_abilities(const std::string &ability, const
map_location& loc) const;
unit_ability_list get_abilities(const std::string &ability) const
{ return get_abilities(ability, loc_); }
- std::vector<std::string> ability_tooltips(const map_location& loc)
const;
- std::vector<std::string> unit_ability_tooltips() const;
+ std::vector<std::string> ability_tooltips(bool force_active = false)
const;
std::vector<std::string> get_ability_list() const;
bool has_ability_type(const std::string& ability) const;
Modified: trunk/src/unit_abilities.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_abilities.cpp?rev=35793&r1=35792&r2=35793&view=diff
==============================================================================
--- trunk/src/unit_abilities.cpp (original)
+++ trunk/src/unit_abilities.cpp Thu May 21 18:21:18 2009
@@ -181,25 +181,6 @@
return res;
}
-std::vector<std::string> unit::unit_ability_tooltips() const
-{
- std::vector<std::string> res;
-
- const config &abilities = cfg_.child("abilities");
- if (!abilities) return res;
- foreach (const config::any_child &ab, abilities.all_children_range())
- {
- std::string const &name =
- this->gender_ == unit_race::MALE ||
ab.cfg["female_name"].empty() ?
- ab.cfg["name"] : ab.cfg["female_name"];
- if (!name.empty()) {
- res.push_back(name);
- res.push_back(ab.cfg["description"]);
- }
- }
- return res;
-}
-
std::vector<std::string> unit::get_ability_list() const
{
std::vector<std::string> res;
@@ -214,7 +195,7 @@
return res;
}
-std::vector<std::string> unit::ability_tooltips(const map_location& loc) const
+std::vector<std::string> unit::ability_tooltips(bool force_active) const
{
std::vector<std::string> res;
@@ -223,7 +204,7 @@
foreach (const config::any_child &ab, abilities.all_children_range())
{
- if (ability_active(ab.key, ab.cfg, loc))
+ if (force_active || ability_active(ab.key, ab.cfg, loc_))
{
std::string const &name =
gender_ == unit_race::MALE ||
ab.cfg["female_name"].empty() ?
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
