widelands

Merge lp://qastaging/~widelands-dev/widelands/economy-target-profiles into lp://qastaging/widelands

economy-target-profiles
Merge into trunk

Proposed by Benedikt Straub on 2019-08-13

Status:

Merged

Merged at revision:

9179

Proposed branch:

lp://qastaging/~widelands-dev/widelands/economy-target-profiles

Merge into:

lp://qastaging/widelands

Diff against target:

75 lines (+10/-8)

2 files modified

src/wui/economy_options_window.cc (+10/-7)
src/wui/economy_options_window.h (+0/-1)

To merge this branch:

bzr merge lp://qastaging/~widelands-dev/widelands/economy-target-profiles

Related bugs:

Bug #1827696: Allow users to define their own economy default settings	Wishlist	Won't Fix
Bug #1831196: Economy profile selection doesn't work	High	Won't Fix
Bug #1839948: Missing can_act check in EconomyOptionsWindow	Medium	Won't Fix
Bug #1842335: Economy settings don't move to foreground on fieldaction	Medium	Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
GunChleoc		2019-08-13	Approve on 2019-08-13
Review via email: mp+371251@code.qastaging.launchpad.net

Commit message

Forbid changing economy targets by spectators

Description of the change

Added some missing checks for can_act and got rid of an unused variable.
It is still allowed to save another player´s targets to disk though as this does not affect the game.

Revision history for this message

GunChleoc (gunchleoc) wrote on 2019-08-13:

LGTM :)

Do we want to disable the save button too?

Revision history for this message

Benedikt Straub (nordfriese) wrote on 2019-08-13:

It cannot affect the game, so this isn´t necessary. But perhaps one might want to save some clever economy settings of another player for future use in own games, so why not allow it?

Revision history for this message

GunChleoc (gunchleoc) wrote on 2019-08-13:

OK, let's have it then :)

@bunnybot merge

review: Approve

Revision history for this message

bunnybot (widelandsofficial) wrote on 2019-08-13:

Continuous integration builds have changed state:

Travis build 5320. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/571293137.
Appveyor build 5092. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_target_profiles-5092.