[Commits] [wesnoth/wesnoth] b7367b: Create Engine: keep a member reference to the game...

GitHub noreply at github.com
Fri Nov 24 22:03:42 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b7367b8b077ab77397512009c3227752bb551020
      https://github.com/wesnoth/wesnoth/commit/b7367b8b077ab77397512009c3227752bb551020
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/create_engine.hpp

  Log Message:
  -----------
  Create Engine: keep a member reference to the game config

Shortens the code slightly by avoiding continuously fetching it from the gc manager.


  Commit: 8bf95ce69a9bd59d98d14653cc727368d23f75c0
      https://github.com/wesnoth/wesnoth/commit/8bf95ce69a9bd59d98d14653cc727368d23f75c0
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M src/gui/core/event/dispatcher.cpp
    M src/gui/core/event/dispatcher.hpp
    M src/gui/core/event/handler.cpp
    M src/gui/dialogs/multiplayer/lobby.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/widgets/window.cpp

  Log Message:
  -----------
  GUI2: changed hotkey callback return value to void

The bool retval was presumably meant to allow stopping execution of the main hotkey callbacks
if a local one was meant to take precedence. However, that wasn't used anywhere (all callbacks
were returning true) and the return value just meant we had to create lambdas or wrapper functions
everywhere. If necessary, we can re-add halt functionality later.

I did leave sdl_event_handler::hotkey_pressed returning a bool value, though, except now it signals
whether there was a valid dispatcher with which to execute the hotkey callback. This seemed reasonable
since we probably wouldn't want to continue if there were no dispatcher anyway, though this only has
any effect in the key_down handler.


  Commit: fafdb95c848af5381c0e5ff5349c973f0df4a0c5
      https://github.com/wesnoth/wesnoth/commit/fafdb95c848af5381c0e5ff5349c973f0df4a0c5
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/title_screen.hpp

  Log Message:
  -----------
  Title Screen: minor refactoring to button callback registering

* Removed window reference from callback function signature. Instead, bind (or capture)
  window reference when register_button is called.
* Moved long callbacks to their own functions.


  Commit: 6d8cbf281fcae9d9e8d9ee1c5b3630674ed5a1c1
      https://github.com/wesnoth/wesnoth/commit/6d8cbf281fcae9d9e8d9ee1c5b3630674ed5a1c1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/network_asio.cpp
    M src/network_asio.hpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/7ff30491fe46...6d8cbf281fca


More information about the Commits mailing list