Merge lp:~gunchleoc/widelands/bug-1619157-random-ai-none into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8109
Proposed branch: lp:~gunchleoc/widelands/bug-1619157-random-ai-none
Merge into: lp:widelands
Diff against target: 25 lines (+2/-2)
2 files modified
src/logic/single_player_game_settings_provider.cc (+1/-1)
src/network/nethost.cc (+1/-1)
To merge this branch: bzr merge lp:~gunchleoc/widelands/bug-1619157-random-ai-none
Reviewer Review Type Date Requested Status
TiborB Approve
Review via email: mp+306518@code.launchpad.net

Commit message

Random AI no longer selects the empty AI.

Description of the change

Since this is clearly a regression and the fix is tiny, I am in favour of having this in Build 19.

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

Continuous integration builds have changed state:

Travis build 1350. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/161981847.
Appveyor build 1192. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_gunchleoc_widelands_bug_1619157_random_ai_none-1192.

Revision history for this message
TiborB (tiborb95) wrote :

Looks good (code + testing), It seemed that "very weak" AI is picked less then other types, but maybe it was just coincidence...

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

Yes, probably just coincidence.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/single_player_game_settings_provider.cc'
2--- src/logic/single_player_game_settings_provider.cc 2016-08-04 15:49:05 +0000
3+++ src/logic/single_player_game_settings_provider.cc 2016-09-22 17:42:29 +0000
4@@ -142,7 +142,7 @@
5 do {
6 uint8_t random = (std::rand() % impls.size()); // Choose a random AI
7 it = impls.begin() + random;
8- } while ((*it)->name == "None");
9+ } while ((*it)->name == "empty");
10 }
11 s.players[number].ai = (*it)->name;
12 }
13
14=== modified file 'src/network/nethost.cc'
15--- src/network/nethost.cc 2016-08-04 15:49:05 +0000
16+++ src/network/nethost.cc 2016-09-22 17:42:29 +0000
17@@ -180,7 +180,7 @@
18 do {
19 uint8_t random = (std::rand() % impls.size()); // Choose a random AI
20 it = impls.begin() + random;
21- } while ((*it)->name == "None");
22+ } while ((*it)->name == "empty");
23 set_player_ai(number, (*it)->name, true);
24 newstate = PlayerSettings::stateComputer;
25 break;

Subscribers

People subscribed via source and target branches

to status/vote changes: