diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/gui/setup_players.cpp | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/gui/setup_players.cpp')
| -rw-r--r-- | src/gui/setup_players.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 6fab8bd2..e9faaf3a 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -131,15 +131,14 @@ public: signalBeforeUpdate(); freeWidgets(); - std::vector<std::string> *player_names = player_relations.getPlayers(); if (mPlayers) delete mPlayers; - mPlayers = player_names; + mPlayers = player_relations.getPlayers(); // set up widgets - for (unsigned int r = 0; r < player_names->size(); ++r) + for (unsigned int r = 0; r < mPlayers->size(); ++r) { - std::string name = (*player_names)[r]; + std::string name = (*mPlayers)[r]; gcn::Widget *widget = new Label(name); mWidgets.push_back(widget); |