Merge lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe into lp:widelands
Proposed by
GunChleoc
Status: | Merged |
---|---|
Merged at revision: | 8800 |
Proposed branch: | lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe |
Merge into: | lp:widelands |
Diff against target: |
139 lines (+25/-16) 5 files modified
src/editor/editorinteractive.cc (+5/-2) src/editor/map_generator.cc (+2/-2) src/editor/ui_menus/player_menu.cc (+10/-9) src/editor/ui_menus/player_menu.h (+0/-2) src/ui_fsmenu/launch_spg.cc (+8/-1) |
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Klaus Halfmann | compile, review, test, | Approve | |
Notabilis | Needs Fixing | ||
GunChleoc | Needs Resubmitting | ||
Review via email: mp+352943@code.launchpad.net |
Commit message
Empty player tribes are interpreted as random tribe. Random Map Generator now assigns a random tribe to all players.
- Fix crash when loading a map in the editor where there is a player with no
tribe assigned: player loading removed, because it's unused in the editor
anyway
- Map Editors now can choose "Random" tribe in the player menu
- If player tribe is empty in map, set random player in singleplayer game
setup
Description of the change
I decided not to bother with any UI changes at this point - we have more important bugs to fix for Build 20.
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 3777. State: errored. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 415165379. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ bug_1783878_ editor_ random_ map_tribe- 3576.
Appveyor build 3576. State: failed. Details: https:/