[wesnoth-commits] [wesnoth/wesnoth] 26b5ca: disallow attacking with disabled attacks via [do_c...

GitHub noreply at github.com
Fri Jun 29 23:12:59 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 26b5ca55e40176f338265b162178df7342ec2882
      https://github.com/wesnoth/wesnoth/commit/26b5ca55e40176f338265b162178df7342ec2882
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M data/test/scenarios/feeding.cfg
    M src/actions/attack.cpp

  Log Message:
  -----------
  disallow attacking with disabled attacks via [do_command]

this fixes some rare cheats in mp.


  Commit: 5ba389111eaa5d08f55d60c1b437c250a329bc58
      https://github.com/wesnoth/wesnoth/commit/5ba389111eaa5d08f55d60c1b437c250a329bc58
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M data/gui/window/mp_join_game.cfg
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.hpp

  Log Message:
  -----------
  allow non hosts to change factions later.

previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.


  Commit: c805897797d7ff22f3ea4fd1ce9c0fb126baefea
      https://github.com/wesnoth/wesnoth/commit/c805897797d7ff22f3ea4fd1ce9c0fb126baefea
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

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

  Log Message:
  -----------
  make flg manager not store confg& side_

in the non-host case the clients might get updates that change the [side] config while the flg dialog is open which might result in invalid pointers,  note that flg_manager::default_leader_cfg_ is still there but this is no problm because that is never dereferenced it's only compared to other pointers.

we also make a copy of all [multiplayer_side] on the non hosts side for the same reason.


  Commit: 2dd65574498a9731b501e18da04c01f959ab6654
      https://github.com/wesnoth/wesnoth/commit/2dd65574498a9731b501e18da04c01f959ab6654
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/gui/dialogs/multiplayer/faction_select.cpp
    M src/gui/dialogs/multiplayer/faction_select.hpp
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.hpp
    A src/utils/scope_exit.hpp

  Log Message:
  -----------
  cancel faction_select when the game starts

or when the hosts assigned  control of  that side to another player.


  Commit: c55512755237dc818abc3b6bce4c3d31dbd2449b
      https://github.com/wesnoth/wesnoth/commit/c55512755237dc818abc3b6bce4c3d31dbd2449b
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

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

  Log Message:
  -----------
  mp join: fix crash when the dialog is updated while the flg dialog is open.

we cannnot call show_flg_select from inside the select_leader_buttons callback because that select_leader_buttons might be deleted/recreated while that dialog is open whihc leads to crashes, so what we do is executing the show_flg_select
 in a seperate callstack by using a 0 ms non-repeating timer


  Commit: 0296b6068cad37db4034b1edcc33025e3be82987
      https://github.com/wesnoth/wesnoth/commit/0296b6068cad37db4034b1edcc33025e3be82987
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/gui/core/timer.cpp

  Log Message:
  -----------
  add a comment


  Commit: a2a4dff050713e96b0b14612486d82cf3f93fa3d
      https://github.com/wesnoth/wesnoth/commit/a2a4dff050713e96b0b14612486d82cf3f93fa3d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

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

  Log Message:
  -----------
  fix code dublication of mp_join_game::show_flg_select

this also fixes a bug where the side number in the initial flg dialog would be off by one.

This is also a slight behviour change where not finding [era] in mp_join_game::fetch_game_config no longer throws config::error but just returns false (=cannot join game)


Compare: https://github.com/wesnoth/wesnoth/compare/649fdc9a6204...a2a4dff05071
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the Commits mailing list