Klaus Halfmann has proposed merging
lp:~widelands-dev/widelands/bug-1395278-logic2 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1395278 in widelands: "Consolidate naming of member variables"
https://bugs.launchpad.net/widelands/+bug/1395278
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-logic2/+merge/287687
Review is ok for me, pure renaming, nothing else,
will play some open network game now...
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1395278-logic2 into lp:widelands.
=== modified file 'src/game_io/game_player_economies_packet.cc'
--- src/game_io/game_player_economies_packet.cc 2015-11-28 22:29:26 +
+++ src/game_io/game_player_economies_packet.cc 2016-03-01 18:23:35 +
@@ -48,7 +48,7 @@
if (packet_version == kCurrentPacketVersion) {
iterate_players_existing(p, nr_players, game, player)
try {
- Player::Economies & economies = player->m_economies;
+ Player::Economies & economies = player->economies_;
for (uint32_t i = 0; i < economies.size(); ++i) {
uint32_t value = fr.unsigned_32();
if (value < 0x) {
@@ -106,7 +106,7 @@
const Field & field_0 = map[0];
PlayerNumber const nr_players = map.get_nrplayers();
iterate_players_existing_const(p, nr_players, game, player) {
- const Player::Economies & economies = player->m_economies;
+ const Player::Economies & economies = player->economies_;
for (Economy * temp_economy : economies) {
bool wrote_this_economy = false;
=== modified file 'src/game_io/game_player_info_packet.cc'
--- src/game_io/game_player_info_packet.cc 2016-01-22 19:53:32 +
+++ src/game_io/game_player_info_packet.cc 2016-03-01 18:23:35 +
@@ -64,12 +64,12 @@
player.read_statistics(fr);
player.read_remaining_shipnames(fr);
- player.m_casualties = fr.unsigned_32();
- player.m_kills = fr.unsigned_32();
- player.m_msites_lost = fr.unsigned_32();
- player.m_msites_defeated = fr.unsigned_32();
- player.m_civil_blds_lost = fr.unsigned_32();
- player.m_civil_blds_defeated = fr.unsigned_32();
+ player.casualties_ = fr.unsigned_32();
+ player.kills_ = fr.unsigned_32();
+ player.msites_lost_ = fr.unsigned_32();
+ player.msites_defeated_ = fr.unsigned_32();
+ player.civil_blds_lost_ = fr.unsigned_32();
+ player.civil_blds_defeated_ = fr.unsigned_32();
}
}
game.read_statistics(fr);
@@ -95,9 +95,9 @@
iterate_players_existing_const(p, nr_players, game, plr) {
fw.unsigned_8(1); // Player is in game.
- fw.unsigned_8(plr->m_see_all);
+ fw.unsigned_8(plr->see_all_);
- fw.unsigned_8(plr->m_plnum);
+ fw.unsigned_8(plr->player_number_);
fw.unsigned_8(plr->team_number());
fw.c_string(plr->tribe().name().c_str());
@@ -107,8 +107,8 @@
// Economies are in a packet after map loading
- fw.c_string(plr->m_name.c_str());
- fw.c_string(plr->m_ai.c_str());
+ fw.c_string(plr->name_.c_str());
+ fw.c_string(plr->ai_.c_str());
plr->write_statistics(fw);
plr->write_remaining_shipnames(fw);
=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc 2016-02-08 20:44:17 +
+++ src/logic/editor_game_base.cc 2016-03-01 18:23:35 +
@@ -184,7 +184,7 @@
(MapIndex const i, PlayerNumber const new_owner)
{
iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
- Player::Field & player_field = p->m_fields[i];
+ Player::Field & player_field = p->fields_[i];
if (1 < player_field.vision) {
player_field.owner = new_owner;
}
@@ -195,7 +195,7 @@
{
if (!Road::is_road_descr(descr))
iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
- Player::Field & player_field = p->m_fields[i];
+ Player::Field & player_field = p->fields_[i];
if (1 < player_field.vision) {
player_field.map_object_descr[TCoords<>::None] = descr;
}
@@ -523,7 +523,7 @@
MapIndex const i = f.field - _field;
MapIndex const neighbour_i = neighbour.field - _field;
iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
- Player::Field & first_player_field = *p->m_fields;
+ Player::Field & first_player_field = *p->fields_;
Player::Field & player_field = (_player_field)[i];
if
(1 < player_field .vision
=== modified file 'src/logic/map.cc'
--- src/logic/map.cc 2016-02-22 08:50:04 +
+++ src/logic/map.cc 2016-03-01 18:23:35 +
@@ -1694,12 +1694,12 @@
start = FCoords(instart, [](instart));
end = FCoords(inend, [](inend));
- path.m_path.clear();
+ path.path_.clear();
// Some stupid cases...
if (start == end) {
- path.m_start = start;
- path.m_end = end;
+ path.start_ = start;
