Author: alink
Date: Wed Apr 15 21:58:07 2009
New Revision: 34946
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34946&view=rev
Log:
make advance_to() return a reference.
Modified:
trunk/src/help.cpp
trunk/src/unit.hpp
trunk/src/unit_types.hpp
Modified: trunk/src/help.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/help.cpp?rev=34946&r1=34945&r2=34946&view=diff
==============================================================================
--- trunk/src/help.cpp (original)
+++ trunk/src/help.cpp Wed Apr 15 21:58:07 2009
@@ -1258,7 +1258,7 @@
ss << "\n";
// Print cross-references to units that this unit advances from.
- std::vector<std::string> from_units = type_.advances_from();
+ const std::vector<std::string>& from_units =
type_.advances_from();
if (!from_units.empty())
{
ss << _("Advances from: ");
@@ -1287,7 +1287,7 @@
// Print the units this unit can advance to. Cross reference
// to the topics containing information about those units.
- std::vector<std::string> next_units = type_.advances_to();
+ const std::vector<std::string>& next_units =
type_.advances_to();
if (!next_units.empty()) {
ss << _("Advances to: ");
for (std::vector<std::string>::const_iterator
advance_it = next_units.begin(),
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=34946&r1=34945&r2=34946&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Wed Apr 15 21:58:07 2009
@@ -80,7 +80,7 @@
/** Advances this unit to another type */
void advance_to(const unit_type* t, bool use_traits=false, game_state*
state = 0);
- const std::vector<std::string> advances_to() const { return
advances_to_; }
+ const std::vector<std::string>& advances_to() const { return
advances_to_; }
/** The type id of the unit */
const std::string& type_id() const { return type_; }
Modified: trunk/src/unit_types.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.hpp?rev=34946&r1=34945&r2=34946&view=diff
==============================================================================
--- trunk/src/unit_types.hpp (original)
+++ trunk/src/unit_types.hpp Wed Apr 15 21:58:07 2009
@@ -216,8 +216,8 @@
const unit_movement_type& movement_type() const { return movementType_;
}
int experience_needed(bool with_acceleration=true) const;
- std::vector<std::string> advances_to() const { return advances_to_; }
- std::vector<std::string> advances_from() const { return advances_from_;
}
+ const std::vector<std::string>& advances_to() const { return
advances_to_; }
+ const std::vector<std::string>& advances_from() const { return
advances_from_; }
config::const_child_itors modification_advancements() const
{ return cfg_.child_range("advancement"); }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
