[Commits] [wesnoth/wesnoth] d43c26: make server level_ reflect true start of game posi...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d43c2606c50123f79792aa4913c78ea0f6b95739
      https://github.com/wesnoth/wesnoth/commit/d43c2606c50123f79792aa4913c78ea0f6b95739
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M src/replay.cpp
    M src/server/game.cpp
    M src/server/server.cpp

  Log Message:
  -----------
  make server level_ reflect true start of game position

Previousy, the [side]'s in level_ were updated with controller changes,
so that observers who join would be up to date, since controller changes
were not stored in history. We now change this, so that controller changes
are stored in history.

These are stored as "[record_change_controller]" tags rather than
"[change_controller]" because during a replay we should not
restart the turn and reinit in the event of such a change.

This is in preparation to move all controller tweaks to server-side.


  Commit: 5e046acb2541f59f7a27eb02f6033a82d552aad4
      https://github.com/wesnoth/wesnoth/commit/5e046acb2541f59f7a27eb02f6033a82d552aad4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M src/multiplayer.cpp
    M src/multiplayer_wait.cpp
    M src/playcampaign.cpp
    M src/playcampaign.hpp
    M src/server/game.cpp
    M src/server/game.hpp
    M src/server/server.cpp

  Log Message:
  -----------
  move controller tweaks to server

(fixup of 736ceaa6c7e81882c9c5b2e932307b1f1ecb3bfd)

Following discussion with Soliton, we move all "controller tweaks"
i.e. assignments of networked side to human on the matching client
at start of game, to be server decisions, performed concurrent with
start of game.

In fact the controller tweaks are performed using
game::change_controller, which is modified so that it doesn't try to
make server messages before the game has started.

When the server receives [start_game] from the host, the server will
call game::change_controller for every side, sending corresponding
messages to all players and observers, updating them as appropriate.
The server will also rewrite level_ so that human sides are "network"
and ai sides are "network_ai", making the level_ correct for any
observer who subsequently joins.

We remove the obsoleted client-side code in playcampaign.cpp,
multiplayer.cpp.

We also add to multiplayer_wait.cpp the necessary support code to
interpret [change_controller] messages recieved before game start.


  Commit: 330a447e815d703abab195fc9c70c699e2159991
      https://github.com/wesnoth/wesnoth/commit/330a447e815d703abab195fc9c70c699e2159991
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: ae351052a5a95e556d8526fb9f7923f81a225c2e
      https://github.com/wesnoth/wesnoth/commit/ae351052a5a95e556d8526fb9f7923f81a225c2e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M projectfiles/CodeBlocks/README.txt
    M projectfiles/VC9/README.txt
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/VC9/wesnothlib.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/SConscript

  Log Message:
  -----------
  Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/7e9e46729f2f...ae351052a5a9