[wesnoth-commits] [wesnoth/wesnoth] 274da8: fix chat during [delay] and animations

GitHub noreply at github.com
Sun Mar 25 15:07:56 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 274da80788b3ec1c2517a9ed305d796d688382d3
      https://github.com/wesnoth/wesnoth/commit/274da80788b3ec1c2517a9ed305d796d688382d3
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M src/controller_base.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playturn.cpp
    M src/playturn.hpp
    M src/playturn_network_adapter.cpp
    M src/playturn_network_adapter.hpp

  Log Message:
  -----------
  fix chat during [delay] and animations

fixes #1856


  Commit: 94aa24c5a80076feb16018e1e7939622934a3a29
      https://github.com/wesnoth/wesnoth/commit/94aa24c5a80076feb16018e1e7939622934a3a29
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M src/playmp_controller.cpp

  Log Message:
  -----------
  fix moves sometimes not undone when control is changed.

with the 'fix chat not working during delay/animation' it could happen
that play_slice_catch would process a incoming controller change in
which case that while loop would end without the code inside that 'if
(player_type_changed_)' being executed, which woudl lead to oos errors
since that client woudl have made moves that other players don't have.


  Commit: f219b527e4b5b83dade346a2091e45380c0961ef
      https://github.com/wesnoth/wesnoth/commit/f219b527e4b5b83dade346a2091e45380c0961ef
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M src/playmp_controller.cpp

  Log Message:
  -----------
  fix playmp_controller reading later network packages

in linger mode.

playmp_controller::play_linger_turn calls play_slice after processing
end_linger/[notify_next_scenario] which would (after 'fix chat in
[delay]' commit) then read more data from the network in particular data
for the next scenario which will then be lost.


Compare: https://github.com/wesnoth/wesnoth/compare/6b98bbdca125...f219b527e4b5


More information about the Commits mailing list