[Commits] [wesnoth/wesnoth] 199d84: dont treat controller=reserved specially in game::...

GitHub noreply at github.com
Tue Dec 29 22:31:08 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 199d8416df9e390fbb0c42bab743ff53811e275c
      https://github.com/wesnoth/wesnoth/commit/199d8416df9e390fbb0c42bab743ff53811e275c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  dont treat controller=reserved specially in game::update_side_data()

controller=reserved should tread reserved like other not-assigned-yet
sides and not like null controlled sides.


  Commit: 5908d972c5284ba32f8a0595a95028078d0e6fc7
      https://github.com/wesnoth/wesnoth/commit/5908d972c5284ba32f8a0595a95028078d0e6fc7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  format fixes


  Commit: 4b3023544d49c38e6b83623323bb59fc8b6777b7
      https://github.com/wesnoth/wesnoth/commit/4b3023544d49c38e6b83623323bb59fc8b6777b7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

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

  Log Message:
  -----------
  remove unused function


  Commit: 0aff1806bb3f1b22e9ab5d4a17002fee63c8313a
      https://github.com/wesnoth/wesnoth/commit/0aff1806bb3f1b22e9ab5d4a17002fee63c8313a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/playturn.cpp
    M src/playturn.hpp
    M src/server/game.cpp
    M src/server/game.hpp

  Log Message:
  -----------
  removed unneeded change_controller calls.

these change_controller calls didnt change the controller (the
controller is always human before and after). I also removed the
serversided code which handles these [change_controller] packages.


  Commit: 03676625e9580648491d8fcc891696f8b4548d73
      https://github.com/wesnoth/wesnoth/commit/03676625e9580648491d8fcc891696f8b4548d73
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

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

  Log Message:
  -----------
  remove some backwards compability code from wesnothd.


  Commit: 26bdf7494d79e299fe57afb52a2bc188590340ff
      https://github.com/wesnoth/wesnoth/commit/26bdf7494d79e299fe57afb52a2bc188590340ff
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  don't change side controllers when reassigning sides.

the bug which was fixed by this code (https://gna.org/bugs/?13038)
shouldn't happen anymore becasue droiding sides now only changes the
proxy controller.


  Commit: 12b72bfa90d1006bd4f2a4e56c387bfb8ede6b62
      https://github.com/wesnoth/wesnoth/commit/12b72bfa90d1006bd4f2a4e56c387bfb8ede6b62
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/server/game.cpp

  Log Message:
  -----------
  don't read [side]side= on serverside

This is more robust becasue we don't even have to think about possible
wrong side= attributes.


  Commit: 4d144821594f2d85dec091796b288249d84784e4
      https://github.com/wesnoth/wesnoth/commit/4d144821594f2d85dec091796b288249d84784e4
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/playturn.cpp
    M src/server/game.cpp
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  replace controller=network,network_ai with is_local=no in [side]

This has 3 advantages:
1) It makes the serversided handling of controller= attribute easier.
2) It prevents OOS causes by wrong use of the [side] controller=
attribute
3) It gived us a field to store the local/remote data for
null-controlled sides, this could be useful in cases where the
controller changes from null no non-null, Currently is_local is ignored
for null-controlled sides.


  Commit: 1b9c72d319ff7d90443265f7a99b1eea141a628f
      https://github.com/wesnoth/wesnoth/commit/1b9c72d319ff7d90443265f7a99b1eea141a628f
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/make_enum.hpp
    M src/server/game.cpp
    M src/server/game.hpp

  Log Message:
  -----------
  use enums instead of strings for controllers in wesnothd::game

This is not only faster, it is also easier to understand, becasue it is
now obvious that every enement of side_controllers_ can only be 'human',
'ai' or 'null'.

This also makes enum::parse() in MAKE_ENUM a template. This way it also works
with other string classes, specially string_span from simple_wml.


  Commit: 99416763f8c95d4bf475035b0625782857db345a
      https://github.com/wesnoth/wesnoth/commit/99416763f8c95d4bf475035b0625782857db345a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M src/game_board.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/multiplayer_wait.hpp
    M src/menu_events.cpp
    M src/server/game.cpp

  Log Message:
  -----------
  Don't modify game::level_ in load_next_scenario()

level_ should be the initial gamestate from an observer point of view,
so this shouldn't be edited when a player advances to the next
scenario.


  Commit: da949ddbe4f031b1be4349f794b9a825224fb0f8
      https://github.com/wesnoth/wesnoth/commit/da949ddbe4f031b1be4349f794b9a825224fb0f8
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

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

  Log Message:
  -----------
  Fix oos casued by mp replay turns feature.


Compare: https://github.com/wesnoth/wesnoth/compare/67476a26bb44...da949ddbe4f0


More information about the Commits mailing list