[Commits] [wesnoth/wesnoth] 9833fa: make "player_id" the controlling client's id for a...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9833fa465762a5c238dff1a7dac4465d97d74010
      https://github.com/wesnoth/wesnoth/commit/9833fa465762a5c238dff1a7dac4465d97d74010
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp

  Log Message:
  -----------
  make "player_id" the controlling client's id for ai sides.

the main intention is to simplify the serversided contoller tweaks.


  Commit: 69829d6b660333bfea89728dbb89e836c42e6dbb
      https://github.com/wesnoth/wesnoth/commit/69829d6b660333bfea89728dbb89e836c42e6dbb
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  simplify serversided controller tweaks

we also simplify the code by using [side]player_id= which is always the controlling client id so we don't have to distinguish between "ai", "human" and "network"

the client never sends controller="network_ai" becasue the mp connect engine converts all "network_ai" into "ai". But the serversided controller tweaks convert "ai" into "network_ai".


  Commit: 1d6d7a9c1d204ee1b4906125b323f85355a0e1b3
      https://github.com/wesnoth/wesnoth/commit/1d6d7a9c1d204ee1b4906125b323f85355a0e1b3
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  fix leader names in mp

"name" is here the name of the leader, previously the flg manager set it
to the name of the faction.


  Commit: 027dc80c4dd10bd0f8a28faa429b81bdb36a747a
      https://github.com/wesnoth/wesnoth/commit/027dc80c4dd10bd0f8a28faa429b81bdb36a747a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  remove unneeded check

"save_id" isn't used to detemine which clients controlls which side. So
this check doesnt make sense.


  Commit: 7da44d91dc42a6e87716aefe2f95c3f8b9140c3a
      https://github.com/wesnoth/wesnoth/commit/7da44d91dc42a6e87716aefe2f95c3f8b9140c3a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

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

  Log Message:
  -----------
  fix segfault in [replace_map]

a default constructed vconfig was previously unable to be derefereced,
Now it can be dereferenced.
The previous behaviour led to segfaults on wrong parameters to
[replace_map].


  Commit: af89a91de7e624dc6f02b25c23ff4cda5ee932cb
      https://github.com/wesnoth/wesnoth/commit/af89a91de7e624dc6f02b25c23ff4cda5ee932cb
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  fix [side]controller= in mp_connect

this was broken in the commit "make "player_id" the controlling client's
id for ai sides"


  Commit: 48fa14d49c7babcb158311318744659f361d20d7
      https://github.com/wesnoth/wesnoth/commit/48fa14d49c7babcb158311318744659f361d20d7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  "Anonymous local player" -> "Anonymous player"

this string is displayed by non hosts too, so "local" is not true since
it's not local from the other clients point of view.
Also the previous string was too large for a unit name in the sidebar.
Note that this does not effect the "Local player" string in the hosts mp
connect controller options.


  Commit: 8a6a3cc476d9e68737ba22469dab208399e997b1
      https://github.com/wesnoth/wesnoth/commit/8a6a3cc476d9e68737ba22469dab208399e997b1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/multiplayer_wait.cpp

  Log Message:
  -----------
  fixup user_description generation


  Commit: bb9b00b7707afd0bf1ec4b7292341d5acf09600f
      https://github.com/wesnoth/wesnoth/commit/bb9b00b7707afd0bf1ec4b7292341d5acf09600f
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  fix value of "current_player" in mp_connect


Compare: https://github.com/wesnoth/wesnoth/compare/97b654beffd6...bb9b00b7707a