From ee7df74fa1c2e16a1ad5c5fb0835842851b625bc Mon Sep 17 00:00:00 2001 From: Sadie del Solar Date: Mon, 29 Apr 2024 12:40:07 -0700 Subject: [PATCH] Add: Compiler check for _fios_colours/DetailFileType --- src/fileio_type.h | 3 +++ src/fios_gui.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/fileio_type.h b/src/fileio_type.h index c871c1c14b..e5955fb90a 100644 --- a/src/fileio_type.h +++ b/src/fileio_type.h @@ -40,6 +40,9 @@ enum DetailedFileType { DFT_FIOS_DIR, ///< A directory entry. DFT_FIOS_DIRECT, ///< Direct filename. + /* Ending variable used for compile time check of this array against _fios_colours in fiose_gui.cpp */ + DFT_END, + DFT_INVALID = 255, ///< Unknown or invalid file. }; diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index bf7812570e..196dde02c7 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -238,7 +238,8 @@ static const TextColour _fios_colours[] = { TC_DARK_GREEN, // DFT_FIOS_DIR TC_ORANGE, // DFT_FIOS_DIRECT }; - +/* This should align with the DetailedFileType enum defined in fileio_type.h */ +static_assert (lengthof(_fios_colours) == DFT_END); /** * Sort the collected list save games prior to displaying it in the save/load gui.