Cleaned up resources.hpp includes

Includes one change of the source of a CVideo variable to remove a resources usecase.

src/actions/undo_update_shroud_action.cpp

@@ -1,5 +1,4 @@
 #include "actions/undo_update_shroud_action.hpp"
-#include "resources.hpp"
 #include "replay.hpp"
 
 namespace actions

src/editor/action/action.cpp

@@ -22,8 +22,6 @@
 #include "editor/map/map_context.hpp"
 #include "gettext.hpp"
 
-#include "resources.hpp"
-
 #include <memory>
 
 namespace editor {

src/editor/map/map_context.cpp

@@ -24,7 +24,6 @@
 #include "gettext.hpp"
 #include "map/exception.hpp"
 #include "map/label.hpp"
-#include "resources.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "terrain/type_data.hpp"

src/game_events/manager_impl.cpp

@@ -23,7 +23,6 @@
 #include "game_data.hpp"
 #include "log.hpp"
 #include "reports.hpp"
-#include "resources.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "serialization/string_utils.hpp"
 

src/gui/dialogs/chat_log.cpp

@@ -35,7 +35,6 @@
 #include "serialization/unicode.hpp"
 #include "game_preferences.hpp"
 #include "log.hpp"
-#include "resources.hpp"
 #include "replay.hpp"
 #include "gettext.hpp"
 

src/gui/dialogs/unit_attack.cpp

@@ -37,7 +37,6 @@
 #include "gettext.hpp"
 #include "help/help.hpp"
 #include "language.hpp"
-#include "resources.hpp"
 #include "color.hpp"
 #include "team.hpp"
 #include "units/unit.hpp"
@@ -101,7 +100,7 @@ void unit_attack::damage_calc_callback(window& window)
 	battle_prediction_pane battle_pane(weapons_[index], (*attacker_itor_).get_location(), (*defender_itor_).get_location());
 	std::vector<gui::preview_pane*> preview_panes = {&battle_pane};
 
-	gui::show_dialog(resources::screen->video(), nullptr, _("Damage Calculations"), "", gui::OK_ONLY, nullptr, &preview_panes);
+	gui::show_dialog(window.video(), nullptr, _("Damage Calculations"), "", gui::OK_ONLY, nullptr, &preview_panes);
 }
 
 void unit_attack::pre_show(window& window)

src/gui/dialogs/unit_create.cpp

@@ -37,7 +37,6 @@
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "play_controller.hpp"
-#include "resources.hpp"
 #include "team.hpp"
 #include "units/types.hpp"
 

src/quit_confirmation.cpp

@@ -18,7 +18,7 @@
 #include "video.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/widgets/window.hpp"
-#include "resources.hpp"
+
 #include <boost/range/adaptor/reversed.hpp>
 
 std::vector<quit_confirmation*> quit_confirmation::blockers_ = std::vector<quit_confirmation*>();

src/synced_checkup.cpp

@@ -16,7 +16,6 @@
 #include "log.hpp"
 #include "replay.hpp"
 #include "synced_user_choice.hpp"
-#include "resources.hpp"
 
 static lg::log_domain log_replay("replay");
 #define DBG_REPLAY LOG_STREAM(debug, log_replay)

src/synced_commands.cpp

@@ -15,7 +15,6 @@
 #include <cassert>
 
 #include "log.hpp"
-#include "resources.hpp"
 #include "map/location.hpp"
 #include "game_data.hpp"
 #include "units/unit.hpp"

src/units/helper.cpp

@@ -17,7 +17,6 @@
  * Support functions for dealing with units.
  */
 
-#include "resources.hpp"
 #include "units/unit.hpp"
 #include "units/helper.hpp"
 

src/whiteboard/highlighter.cpp

@@ -30,7 +30,6 @@
 #include "whiteboard/move.hpp"
 #include "whiteboard/recall.hpp"
 #include "whiteboard/recruit.hpp"
-#include "resources.hpp"
 #include "whiteboard/side_actions.hpp"
 #include "whiteboard/suppose_dead.hpp"
 #include "whiteboard/utility.hpp"