Added override specifiers for display_context overrides

Also did some formatting cleanup in game_board. Didn't really care to touch the others.

Removed virtual specifier from non-const game_board::teams. It didn't override anything
in the base class (display_context, which has the const version) and nothing inherits
from game_board to override it (the non-const version) later.

src/game_board.hpp

@@ -89,14 +89,42 @@ class game_board : public display_context
 	game_board(const ter_data_cache & tdata, const config & level);
 	virtual ~game_board();
 
-	virtual const std::vector<team> & teams() const { return teams_; }
+	virtual const std::vector<team>& teams() const override
+	{
+		return teams_;
+	}
+
+	std::vector<team>& teams()
+	{
+		return teams_;
+	}
+
 	using display_context::get_team; // so as not to hide the const version
-	team& get_team(int i) {return teams_.at(i - 1);}
-	virtual std::vector<team> & teams() { return teams_; }
-	virtual const gamemap & map() const { return *map_; }
-	virtual const unit_map & units() const { return units_; }
-	unit_map & units() { return units_; }
-	virtual const std::vector<std::string> & hidden_label_categories() const { return labels_; }
+
+	team& get_team(int i)
+	{
+		return teams_.at(i - 1);
+	}
+
+	virtual const gamemap& map() const override
+	{
+		return *map_;
+	}
+
+	virtual const unit_map& units() const override
+	{
+		return units_;
+	}
+
+	unit_map& units()
+	{
+		return units_;
+	}
+
+	virtual const std::vector<std::string>& hidden_label_categories() const override
+	{
+		return labels_;
+	}
 
 	// Copy and swap idiom, because we have a scoped pointer.
 

src/pathfind/teleport.cpp

@@ -71,10 +71,10 @@ class ignore_units_display_context : public display_context {
 		static unit_map empty_unit_map;
 		um_ = &empty_unit_map;
 	}
-	const unit_map & units() const { return *um_; }
-	const gamemap & map() const { return *gm_; }
-	const std::vector<team> & teams() const { return *tm_; }
-	const std::vector<std::string> & hidden_label_categories() const { return *lbls_; }
+	const unit_map & units() const override { return *um_; }
+	const gamemap & map() const override { return *gm_; }
+	const std::vector<team> & teams() const override { return *tm_; }
+	const std::vector<std::string> & hidden_label_categories() const override { return *lbls_; }
 
 private:
 	const unit_map * um_;

src/tests/gui/test_gui2.cpp

@@ -370,10 +370,10 @@ class dummy_display_context : public display_context
 
 	virtual ~dummy_display_context(){}
 
-	virtual const gamemap & map() const { return m; }
-	virtual const unit_map & units() const { return u; }
-	virtual const std::vector<team> & teams() const { return t; }
-	virtual const std::vector<std::string> & hidden_label_categories() const { return lbls; }
+	virtual const gamemap & map() const override { return m; }
+	virtual const unit_map & units() const override { return u; }
+	virtual const std::vector<team> & teams() const override { return t; }
+	virtual const std::vector<std::string> & hidden_label_categories() const override { return lbls; }
 
 private:
 	config dummy_cfg;