From 5721030bd288a395ecddc4da2e228f66643f26bc Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 8 Mar 2025 20:57:01 +0100 Subject: [PATCH] Codefix: use Pool::Get if you know it's valid, especially if you don't check GetIfValid for nullptr --- src/script/api/script_group.cpp | 6 +++--- src/script/script_gui.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp index 6ca20bccda..a636316e30 100644 --- a/src/script/api/script_group.cpp +++ b/src/script/api/script_group.cpp @@ -88,7 +88,7 @@ { EnforcePrecondition(::GroupID::Invalid(), IsValidGroup(group_id)); - const Group *g = ::Group::GetIfValid(group_id); + const Group *g = ::Group::Get(group_id); return g->parent; } @@ -239,7 +239,7 @@ { EnforcePrecondition(ScriptCompany::Colours::COLOUR_INVALID, IsValidGroup(group_id)); - const Group *g = ::Group::GetIfValid(group_id); + const Group *g = ::Group::Get(group_id); if (!HasBit(g->livery.in_use, 0)) return ScriptCompany::Colours::COLOUR_INVALID; return (ScriptCompany::Colours)g->livery.colour1; } @@ -248,7 +248,7 @@ { EnforcePrecondition(ScriptCompany::Colours::COLOUR_INVALID, IsValidGroup(group_id)); - const Group *g = ::Group::GetIfValid(group_id); + const Group *g = ::Group::Get(group_id); if (!HasBit(g->livery.in_use, 1)) return ScriptCompany::Colours::COLOUR_INVALID; return (ScriptCompany::Colours)g->livery.colour2; } diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp index af4cb74dbe..1b4914b90e 100644 --- a/src/script/script_gui.cpp +++ b/src/script/script_gui.cpp @@ -813,8 +813,7 @@ struct ScriptDebugWindow : public Window { return {}; } - const AIInfo *info = Company::GetIfValid(this->filter.script_debug_company)->ai_info; - assert(info != nullptr); + const AIInfo *info = Company::Get(this->filter.script_debug_company)->ai_info; return GetString(STR_AI_DEBUG_NAME_AND_VERSION, info->GetName(), info->GetVersion()); }