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

Return by const reference, not by const value.

Browse source 
As a result, 3bf175313b has been reverted.
This commit is contained in:
Andrius Silinskas 2014-02-05 21:22:09 +00:00
parent 3bf8e052f3
commit 43b134de9b
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/flg_manager.hpp
View file

@ -59,7 +59,7 @@ public:
// matching the criteria.
int find_suitable_faction(const std::string& faction_id = "") const;
const std::vector<const config*> choosable_factions() const
const std::vector<const config*>& choosable_factions() const
{ return choosable_factions_; }
const std::vector<std::string>& choosable_leaders() const
{ return choosable_leaders_; }

5
src/multiplayer_connect.cpp
View file

@ -290,10 +290,7 @@ void connect::side::add_widgets_to_scrollpane(gui::scrollpane& pane, int pos)
void connect::side::update_faction_combo()
{
std::vector<std::string> factions;
const std::vector<const config*>& choosable =
engine_->flg().choosable_factions();
BOOST_FOREACH(const config* faction, choosable) {
BOOST_FOREACH(const config* faction, engine_->flg().choosable_factions()) {
const std::string& name = (*faction)["name"];
const std::string& icon = (*faction)["image"];
if (!icon.empty()) {