Merge lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8901
Proposed branch: lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/editor/ui_menus/player_menu.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe
Reviewer Review Type Date Requested Status
Notabilis Approve
Review via email: mp+356695@code.launchpad.net

Commit message

Fix initialization of last player dropdown in editor player menu

Description of the change

Player number start with 1, not with 0...

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4137. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441494752.
Appveyor build 3934. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797531_playermenu_tribe-3934.

Revision history for this message
Notabilis (notabilis27) wrote :

Code is looking good and last player has no longer the "random" tribe.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/editor/ui_menus/player_menu.cc'
2--- src/editor/ui_menus/player_menu.cc 2018-08-28 18:27:59 +0000
3+++ src/editor/ui_menus/player_menu.cc 2018-10-15 05:06:59 +0000
4@@ -184,7 +184,7 @@
5 }
6
7 plr_tribe->select(
8- (p < map.get_nrplayers() && Widelands::tribe_exists(map.get_scenario_player_tribe(p))) ?
9+ (p <= map.get_nrplayers() && Widelands::tribe_exists(map.get_scenario_player_tribe(p))) ?
10 map.get_scenario_player_tribe(p) :
11 "");
12 plr_tribe->selected.connect(

Subscribers

People subscribed via source and target branches

to status/vote changes: