From cc70f8ca2ad035fc2b46adbd0c8de673106051ef Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Thu, 15 Jun 2017 01:49:31 +1100 Subject: [PATCH] Removed most call to raise_draw_event These don't seem necessary anymore since draw handling happens per-frame and doesn't rely on calling derived class's draw() member. --- src/controller_base.cpp | 1 - src/editor/controller/editor_controller.cpp | 1 - src/play_controller.cpp | 3 --- src/playsingle_controller.cpp | 1 - src/replay_controller.cpp | 1 - 5 files changed, 7 deletions(-) diff --git a/src/controller_base.cpp b/src/controller_base.cpp index 98bc2a7853145..ba80126eb8b62 100644 --- a/src/controller_base.cpp +++ b/src/controller_base.cpp @@ -233,7 +233,6 @@ void controller_base::play_slice(bool is_delay_enabled) events::pump(); events::raise_process_event(); - events::raise_draw_event(); // Update sound sources before scrolling if(soundsource::manager* l = get_soundsource_man()) { diff --git a/src/editor/controller/editor_controller.cpp b/src/editor/controller/editor_controller.cpp index 9e8fc4e60c7b1..e2f6c039f365c 100644 --- a/src/editor/controller/editor_controller.cpp +++ b/src/editor/controller/editor_controller.cpp @@ -89,7 +89,6 @@ editor_controller::editor_controller(const config &game_config, CVideo& video) gui().create_buttons(); gui().redraw_everything(); - events::raise_draw_event(); } void editor_controller::init_gui() diff --git a/src/play_controller.cpp b/src/play_controller.cpp index ce10c5047a8f2..354843ce32544 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -1089,7 +1089,6 @@ void play_controller::start_game() init_gui(); LOG_NG << "first_time..." << (is_skipping_replay() ? "skipping" : "no skip") << "\n"; - events::raise_draw_event(); fire_start(); if (is_regular_game_end()) { return; @@ -1107,7 +1106,6 @@ void play_controller::start_game() else { init_gui(); - events::raise_draw_event(); gamestate().gamedata_.set_phase(game_data::PLAY); gui_->recalculate_minimap(); } @@ -1166,7 +1164,6 @@ void play_controller::play_turn() whiteboard_manager_->on_gamestate_change(); gui_->new_turn(); gui_->invalidate_game_status(); - events::raise_draw_event(); LOG_NG << "turn: " << turn() << "\n"; diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index b781d3a3f9cc0..bee12ab655fee 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -139,7 +139,6 @@ void playsingle_controller::init_gui(){ update_locker lock_display(gui_->video(), is_skipping_replay()); get_hotkey_command_executor()->set_button_state(); - events::raise_draw_event(); } diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp index ece7beafbf3a1..445e0bb4fd138 100644 --- a/src/replay_controller.cpp +++ b/src/replay_controller.cpp @@ -266,7 +266,6 @@ void replay_controller::update_gui() controller_.get_display().recalculate_minimap(); controller_.get_display().redraw_minimap(); controller_.get_display().invalidate_all(); - events::raise_draw_event(); controller_.get_display().draw(); }