[Commits] [wesnoth/wesnoth] ae4881: Cleaned up cases of ;;

GitHub noreply at github.com
Sun Feb 4 13:00:00 UTC 2018


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

  Changed paths:
    M src/gui/dialogs/game_stats.cpp
    M src/gui/widgets/toggle_panel.hpp
    M src/image_modifications.cpp
    M src/scripting/lua_unit_type.cpp
    M src/serialization/string_utils.cpp
    M src/units/unit.cpp

  Log Message:
  -----------
  Cleaned up cases of ;;

[ci skip]


  Commit: 39069c1afa2aef65603d54b75463f0db382d329c
      https://github.com/wesnoth/wesnoth/commit/39069c1afa2aef65603d54b75463f0db382d329c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M src/gui/widgets/menu_button.hpp

  Log Message:
  -----------
  GUI2/Menu Button: added getter for selected row config


  Commit: 77a06e2812b095393c84b342a91d4daf2f798889
      https://github.com/wesnoth/wesnoth/commit/77a06e2812b095393c84b342a91d4daf2f798889
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/gui/dialogs/multiplayer/mp_staging.cpp

  Log Message:
  -----------
  MP Staging: fixed team setting issue when some sides were hidden (fixes #2436)

This was caused by the same bug I added a workaround for in a02c568b785f9d30373aef806507da60000ff1c9.
Essentially, the differing size of player_teams_ and team_names_ could cause an index mismatch if
some sides had allow_player=no and debug mode wasn't on. I didn't notice this before since I always
work with debug mode on.

I've reworked the connect_engine handling of team data. Now, the team_name, user_team_name, and an
is-player-allowed-to-be-on-this-team flag are all handled by a data pod. I've completely removed the
player_teams stuff and instead generate an applicable list of teams for the team menu_button to
display at runtime.

To get around the index disparity issue, I save any displayed team option's index (relative to
connect_engine::team_data) in that option's config (the one then passed to the menu_button). This
allows me to get an appropriate value to pass to connect_engine::set_team without any fancy find-
and-adjust calculations.


Compare: https://github.com/wesnoth/wesnoth/compare/e00ed07a658e...77a06e2812b0


More information about the Commits mailing list