Merge lp:~widelands-dev/widelands/bug-1658668-sp-ai into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8718
Proposed branch: lp:~widelands-dev/widelands/bug-1658668-sp-ai
Merge into: lp:widelands
Diff against target: 19 lines (+5/-3)
1 file modified
src/wui/playerdescrgroup.cc (+5/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1658668-sp-ai
Reviewer Review Type Date Requested Status
Notabilis diff, testing Approve
Review via email: mp+346910@code.launchpad.net

Commit message

Do not change the AI settings when toggling single player slots on/off.

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

Continuous integration builds have changed state:

Travis build 3546. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/384036458.
Appveyor build 3350. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1658668_sp_ai-3350.

Revision history for this message
Notabilis (notabilis27) wrote :

Diff looks good and bug is fixed.

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

Thanks for the review :)

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wui/playerdescrgroup.cc'
2--- src/wui/playerdescrgroup.cc 2018-04-27 06:11:05 +0000
3+++ src/wui/playerdescrgroup.cc 2018-05-26 08:56:33 +0000
4@@ -214,11 +214,13 @@
5 return;
6
7 if (on) {
8- if (settings.players[d->plnum].state == PlayerSettings::State::kClosed)
9- d->settings->next_player_state(d->plnum);
10+ if (settings.players[d->plnum].state == PlayerSettings::State::kClosed) {
11+ d->settings->set_player_state(d->plnum, PlayerSettings::State::kComputer);
12+ }
13 } else {
14- if (settings.players[d->plnum].state != PlayerSettings::State::kClosed)
15+ if (settings.players[d->plnum].state != PlayerSettings::State::kClosed) {
16 d->settings->set_player_state(d->plnum, PlayerSettings::State::kClosed);
17+ }
18 }
19 }
20

Subscribers

People subscribed via source and target branches

to status/vote changes: