[Commits] [wesnoth/wesnoth] d8e0d4: Fixed being thrown back to lobby if becoming an ob...

GitHub noreply at github.com
Tue Feb 13 05:19:39 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d8e0d4c843c72e595053c8738bf3bd599257902e
      https://github.com/wesnoth/wesnoth/commit/d8e0d4c843c72e595053c8738bf3bd599257902e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.hpp
    M src/server/game.cpp

  Log Message:
  -----------
  Fixed being thrown back to lobby if becoming an observer when joining game

I'm gonna say this fixes the nickname issue described in #2122. As I noted on the issue, you can
successfully join a game with reserved slots if the host switches the controller. Since no details
were provided I don't know what issue they were describing exactly, though.

During my testing for that bug, I noticed when I tried to join a game with all sides reserved,
though, I got thrown back to the lobby. Turns out mp_join_game::fetch_game_config was attempting to
find a side controller, couldn't and dropped back to lobby. I made the server notify the player if
that happens so I can toggle the observer flag in the dialog.

Note the "You became an ovserver" message doesn't show anymore, but that's most likely because the
dialog (MP Join Game) isn't fully initialized when the message comes through. When I was being tossed
back to the lobby, it would then display in lobby chat. The old GUI1 mp game creation sequence kept a
single chatbox object throughout the entire process... might consider doing something like that.

Closes #2122 since the main issue described there is fixed and this fixes the only issue I could find
involving nicknames and loading the attached save.


  Commit: 7a1b918cde7c2b6b036934fb95ac31d3cf7884d7
      https://github.com/wesnoth/wesnoth/commit/7a1b918cde7c2b6b036934fb95ac31d3cf7884d7
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp

  Log Message:
  -----------
  MP Join Game: fixed reserved player name not displaying


  Commit: 0bc03e14c749699b7dfee5e8921b8ac34cf49d58
      https://github.com/wesnoth/wesnoth/commit/0bc03e14c749699b7dfee5e8921b8ac34cf49d58
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp

  Log Message:
  -----------
  MP Join Game: fixed leader gender info being missing when loading saves

Like type=, I need to look in [unit] subtags for the gender info.


Compare: https://github.com/wesnoth/wesnoth/compare/1f79416c0c74...0bc03e14c749


More information about the Commits mailing list