From 96a8d7d282bcf528889673ffabbfe12ee817f4d3 Mon Sep 17 00:00:00 2001
From: josteph <josteph@fastmail.com>
Date: Thu, 10 Oct 2019 03:18:13 +0000
Subject: [PATCH] display: Remove a use of 0-index team numbers from the API

---
 src/display.cpp                   | 9 ++-------
 src/display.hpp                   | 2 +-
 src/scripting/game_lua_kernel.cpp | 2 +-
 src/scripting/lua_team.cpp        | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/display.cpp b/src/display.cpp
index 1039c8140eb..21391ae4965 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -287,14 +287,9 @@ void display::init_flags() {
 	image::set_team_colors(&side_colors);
 }
 
-void display::reinit_flags_for_side(std::size_t side)
+void display::reinit_flags_for_team(const team& t)
 {
-	if (!dc_ || side >= dc_->teams().size()) {
-		ERR_DP << "Cannot rebuild flags for inexistent or unconfigured side " << side << '\n';
-		return;
-	}
-
-	init_flags_for_side_internal(side, dc_->teams()[side].color());
+	init_flags_for_side_internal(t.side() - 1, t.color());
 }
 
 void display::init_flags_for_side_internal(std::size_t n, const std::string& side_color)
diff --git a/src/display.hpp b/src/display.hpp
index 54ad3494270..5b3f14634dc 100644
--- a/src/display.hpp
+++ b/src/display.hpp
@@ -641,7 +641,7 @@ public:
 	void init_flags();
 
 	/** Rebuild the flag list (not team colors) for a single side. */
-	void reinit_flags_for_side(std::size_t side);
+	void reinit_flags_for_team(const team&);
 	void reset_reports(reports& reports_object)
 	{
 		reports_object_ = &reports_object;
diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp
index 4ad821f25af..07e3becf0cd 100644
--- a/src/scripting/game_lua_kernel.cpp
+++ b/src/scripting/game_lua_kernel.cpp
@@ -3098,7 +3098,7 @@ int game_lua_kernel::intf_set_side_id(lua_State *L)
 		side.set_flag(flag);
 	}
 
-	game_display_->reinit_flags_for_side(team_i);
+	game_display_->reinit_flags_for_team(side);
 	return 0;
 }
 
diff --git a/src/scripting/lua_team.cpp b/src/scripting/lua_team.cpp
index 68eac705b9a..18f0d8062db 100644
--- a/src/scripting/lua_team.cpp
+++ b/src/scripting/lua_team.cpp
@@ -133,7 +133,7 @@ static int impl_side_set(lua_State *L)
 	const auto& reinit_flag_for_team = [&L] (const team& t) -> void {
 		auto* disp = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).get_display();
 		if(disp) {
-			disp->reinit_flags_for_side(t.side() - 1);
+			disp->reinit_flags_for_team(t);
 		}
 	};
 	// Find the corresponding attribute.