Merge lp:~hjd/widelands/simplify-loop into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 7162
Proposed branch: lp:~hjd/widelands/simplify-loop
Merge into: lp:widelands
Diff against target: 18 lines (+1/-4)
1 file modified
src/game_io/game_player_economies_data_packet.cc (+1/-4)
To merge this branch: bzr merge lp:~hjd/widelands/simplify-loop
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+229320@code.launchpad.net

Description of the change

Basically implementing the solution suggested in the bug report, plus trim out a couple more intermediary variables.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/game_io/game_player_economies_data_packet.cc'
2--- src/game_io/game_player_economies_data_packet.cc 2014-07-28 14:17:07 +0000
3+++ src/game_io/game_player_economies_data_packet.cc 2014-08-02 11:17:59 +0000
4@@ -50,13 +50,10 @@
5 iterate_players_existing(p, nr_players, game, player)
6 try {
7 Player::Economies & economies = player->m_economies;
8- uint16_t const nr_economies = economies.size();
9- Player::Economies ecos(nr_economies);
10- for (Economy * temp_eco : ecos) {
11+ for (uint32_t i = 0; i < economies.size(); ++i) {
12 uint32_t value = fr.Unsigned32();
13 if (value < 0xffffffff) {
14 if (upcast(Flag const, flag, map[value].get_immovable())) {
15- temp_eco = flag->get_economy();
16 EconomyDataPacket d(flag->get_economy());
17 d.Read(fr);
18 } else {

Subscribers

People subscribed via source and target branches

to status/vote changes: