[Commits] [wesnoth/wesnoth] f7f4bc: Revert "Pass CVideo argument directly to certain h...

GitHub noreply at github.com
Tue Jan 12 22:18:52 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f7f4bc27074bd80f4f6df8f7f534d04772a8799a
      https://github.com/wesnoth/wesnoth/commit/f7f4bc27074bd80f4f6df8f7f534d04772a8799a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/help/help.cpp
    M src/help/help.hpp
    M src/help/help_browser.cpp
    M src/help/help_browser.hpp

  Log Message:
  -----------
  Revert "Pass CVideo argument directly to certain help functions"

This reverts commit cf8ff909e10f90aafac945ea8819a2f9a1b4e208.


  Commit: a953848dda1305de6672ba0396784022eb92fcf6
      https://github.com/wesnoth/wesnoth/commit/a953848dda1305de6672ba0396784022eb92fcf6
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/dialogs.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/gui/dialogs/addon_connect.cpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/help/help.cpp
    M src/help/help.hpp
    M src/help/help_browser.cpp
    M src/help/help_browser.hpp
    M src/help/help_button.cpp
    M src/menu_events.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/show_dialog.cpp
    M src/tooltips.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  remove display dependency from show_help()

help_button still needs a display& for regierting it in the hotkey code.


  Commit: 8680ce45c6c06e120939174f7d008faaf88b1bc6
      https://github.com/wesnoth/wesnoth/commit/8680ce45c6c06e120939174f7d008faaf88b1bc6
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/controller_base.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/help/help_button.cpp
    M src/help/help_button.hpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey_handler.hpp
    M src/mouse_events.cpp
    M src/playsingle_controller.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  remove display dependency from hotkey::command_executor

command_executor_default which is used ingame and by the editor now
handles display related stuff. (map screenshots, zoom...)

this also removes a hotkey::basic_handler form titlescreen which didn't
work anyway becasue it didnt pass a hotkey_executor.


  Commit: a96ca1e08b8aec493b1e75dc269149943b263362
      https://github.com/wesnoth/wesnoth/commit/a96ca1e08b8aec493b1e75dc269149943b263362
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/addon/manager_ui.cpp
    M src/dialogs.cpp
    M src/help/help_button.cpp
    M src/help/help_button.hpp

  Log Message:
  -----------
  remove display dependency from help_button

this also fixes the help button in the addon gui1 dialog.


  Commit: 93c53df6d8ad33dd68054c2eec452bf543e7a6ca
      https://github.com/wesnoth/wesnoth/commit/93c53df6d8ad33dd68054c2eec452bf543e7a6ca
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/create_engine.hpp
    M src/game_initialization/mp_options.cpp
    M src/game_initialization/mp_options.hpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer.hpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_configure.hpp
    M src/game_initialization/multiplayer_connect.cpp
    M src/game_initialization/multiplayer_connect.hpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_create.hpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_lobby.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_ui.hpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/multiplayer_wait.hpp
    M src/game_initialization/singleplayer.cpp
    M src/game_launcher.cpp
    M src/game_preferences_display.cpp
    M src/play_controller.cpp
    M src/playmp_controller.cpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/tests/gui/test_gui2.cpp
    M src/widgets/combo.cpp
    M src/widgets/combo.hpp
    M src/widgets/combo_drag.cpp
    M src/widgets/combo_drag.hpp

  Log Message:
  -----------
  remove display dependency from mp connect code.

and from codes that are used by it, specially the loadgame and the
networkrecieve dialog.


  Commit: 056298bfc7a67c0c0d9da5bef417aea9c19d4a5d
      https://github.com/wesnoth/wesnoth/commit/056298bfc7a67c0c0d9da5bef417aea9c19d4a5d
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  fixup SDL1 build


Compare: https://github.com/wesnoth/wesnoth/compare/94357449377a...056298bfc7a6


More information about the Commits mailing list