[wesnoth-commits] [wesnoth/wesnoth] 219f97: fix chat during [delay] and animations

GitHub noreply at github.com
Sun Mar 25 12:47:10 UTC 2018


  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 219f977b2736c35683f98fba2c80b2cc31d16aa5
      https://github.com/wesnoth/wesnoth/commit/219f977b2736c35683f98fba2c80b2cc31d16aa5
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-25 (Sun, 25 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: 1e1a6fbe488a2000f2399faa4c1383f434351563
      https://github.com/wesnoth/wesnoth/commit/1e1a6fbe488a2000f2399faa4c1383f434351563
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-25 (Sun, 25 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: 5361b7d715cd7d4adbcbcdbabc5a7fc3e9f10056
      https://github.com/wesnoth/wesnoth/commit/5361b7d715cd7d4adbcbcdbabc5a7fc3e9f10056
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-03-25 (Sun, 25 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/125c33039a1c...5361b7d715cd


More information about the Commits mailing list