From ed6bf3784dff4394555378d57e8d5fde65f0a2a8 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sun, 9 Aug 2020 19:25:52 -0400 Subject: [PATCH] Remove duplicate fd_null declaration Include field_type.h in ammo_effect.h rather than separately forward-declaring fd_null there. Avoids a clang-tidy warning. --- src/ammo_effect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ammo_effect.h b/src/ammo_effect.h index 47e56804cc777..0df808e38b547 100644 --- a/src/ammo_effect.h +++ b/src/ammo_effect.h @@ -7,10 +7,10 @@ #include #include "explosion.h" +#include "field_type.h" #include "string_id.h" #include "type_id.h" -extern field_type_id fd_null; class JsonObject; struct ammo_effect {