Merge lp://qastaging/~widelands-dev/widelands/reed-compatibility into lp://qastaging/widelands
Proposed by
GunChleoc
Status: | Merged |
---|---|
Merged at revision: | 9146 |
Proposed branch: | lp://qastaging/~widelands-dev/widelands/reed-compatibility |
Merge into: | lp://qastaging/widelands |
Diff against target: |
823 lines (+122/-91) 19 files modified
src/economy/expedition_bootstrap.cc (+3/-3) src/economy/expedition_bootstrap.h (+1/-1) src/economy/input_queue.cc (+7/-6) src/economy/input_queue.h (+1/-1) src/economy/request.cc (+3/-3) src/economy/request.h (+2/-1) src/game_io/game_player_info_packet.cc (+2/-2) src/map_io/map_buildingdata_packet.cc (+42/-38) src/map_io/map_buildingdata_packet.h (+9/-8) src/map_io/map_flagdata_packet.cc (+2/-2) src/map_io/map_flagdata_packet.h (+8/-1) src/map_io/map_object_packet.cc (+4/-4) src/map_io/map_object_packet.h (+1/-1) src/map_io/map_players_view_packet.cc (+9/-9) src/map_io/map_players_view_packet.h (+10/-1) src/map_io/map_roaddata_packet.cc (+2/-2) src/map_io/map_roaddata_packet.h (+8/-1) src/map_io/tribes_legacy_lookup_table.cc (+2/-1) src/map_io/widelands_map_loader.cc (+6/-6) |
To merge this branch: | bzr merge lp://qastaging/~widelands-dev/widelands/reed-compatibility |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hessenfarmer | Approve | ||
Review via email:
|
Commit message
Fix savegame compatibility for reed, buildings, players view and economy requests.
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 5058. State: passed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 537337141. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ reed_compatibil ity-4838.
Appveyor build 4838. State: success. Details: https:/