From d9eab21bd0123c3c2271a6f3f27bfe8318ed36cf Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Thu, 31 Mar 2016 21:25:45 -0400 Subject: [PATCH] Remove redundant gamestate::bind() --- src/game_state.cpp | 5 ----- src/game_state.hpp | 2 -- src/play_controller.cpp | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/game_state.cpp b/src/game_state.cpp index 327bf55a228c..e7a0f2d5acaa 100644 --- a/src/game_state.cpp +++ b/src/game_state.cpp @@ -222,11 +222,6 @@ void game_state::init(const config& level, play_controller & pc) lua_kernel_.reset(new game_lua_kernel(nullptr, *this, pc, *reports_)); } -void game_state::bind(wb::manager *, game_display * gd) -{ - set_game_display(gd); -} - void game_state::set_game_display(game_display * gd) { lua_kernel_->set_game_display(gd); diff --git a/src/game_state.hpp b/src/game_state.hpp index 63f50be362f1..03df263d7b9a 100644 --- a/src/game_state.hpp +++ b/src/game_state.hpp @@ -82,8 +82,6 @@ class game_state : public filter_context void init(const config& level, play_controller &); - void bind(wb::manager *, game_display *); - void set_game_display(game_display *); void write(config& cfg) const; diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 08bc421721c9..c7496ebef4b5 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -276,7 +276,7 @@ void play_controller::init(CVideo& video, const config& level) // This *needs* to be created before the show_intro and show_map_scene // as that functions use the manager state_of_game // Has to be done before registering any events! - gamestate().bind(whiteboard_manager_.get(), gui_.get()); + gamestate().set_game_display(gui_.get()); gui2::tloadscreen::progress("init lua"); resources::lua_kernel = gamestate().lua_kernel_.get(); @@ -336,7 +336,7 @@ void play_controller::reset_gamestate(const config& level, int replay_pos) resources::game_events = gamestate().events_manager_.get(); gamestate_->init(level, *this); - gamestate().bind(whiteboard_manager_.get(), gui_.get()); + gamestate().set_game_display(gui_.get()); resources::lua_kernel = gamestate().lua_kernel_.get(); resources::tunnels = gamestate().pathfind_manager_.get();