[Commits] [wesnoth/wesnoth] fcf861: rename a c++ varaible to match config attribute na...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fcf8619a69d5a17de11c623da4ef88a28a030a7a
      https://github.com/wesnoth/wesnoth/commit/fcf8619a69d5a17de11c623da4ef88a28a030a7a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  rename a c++ varaible to match config attribute name.


  Commit: 0d254fb03e7d33cbb0ed027e1cc5b407a139d179
      https://github.com/wesnoth/wesnoth/commit/0d254fb03e7d33cbb0ed027e1cc5b407a139d179
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M src/team.cpp

  Log Message:
  -----------
  'current_player' shouldn't default to 'save_id'

this doesn't make sense, specially because 'current_player' is a string
used to display in dialogs and 'save_id' is an internal id string

https://gna.org/bugs/?22324,


  Commit: c941f60c4926d00b07bf0913b69dfd6455542ca1
      https://github.com/wesnoth/wesnoth/commit/c941f60c4926d00b07bf0913b69dfd6455542ca1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/playcampaign.cpp
    M src/leader_scroll_dialog.cpp
    M src/menu_events.cpp
    M src/playsingle_controller.cpp
    M src/reports.cpp
    M src/saved_game.cpp
    M src/team.cpp
    M src/team.hpp
    M src/teambuilder.cpp

  Log Message:
  -----------
  add new attribute side_name= in [side]

We cannot call it name becasue thats already used by the unti that is
generated from the side tag.

if given (nonempty), side_name= will be used instead of current_player
in some dialogs (new turn dialog, statistics).

In [scenario] side_name= defaults to name= while in [multiplayer]
side_name= defaults to empty (so that current_player is used in those
dialogs by default).

This specially fixes http://gna.org/bugs/?24226 while still giving wml
authors in mp and in sp the option to use the real players name in those
dialogs.


  Commit: 41f5853028862020d09c2960a28e6435b192ea19
      https://github.com/wesnoth/wesnoth/commit/41f5853028862020d09c2960a28e6435b192ea19
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/playcampaign.cpp
    M src/leader_scroll_dialog.cpp
    M src/menu_events.cpp
    M src/playsingle_controller.cpp
    M src/reports.cpp
    M src/saved_game.cpp
    M src/team.cpp
    M src/team.hpp
    M src/teambuilder.cpp

  Log Message:
  -----------
  Merge pull request #622 from gfgtdf/side_name

Side name


Compare: https://github.com/wesnoth/wesnoth/compare/6b297edfed16...41f585302886