mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: use Pool::Get if you know it's valid, especially if you don't check GetIfValid for nullptr

pull/13791/head
Rubidium 2025-03-08 20:57:01 +01:00 committed by rubidium42
parent 3c7506e07d
commit 5721030bd2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/api/script_group.cpp
View File

@ -88,7 +88,7 @@
{ {
EnforcePrecondition(::GroupID::Invalid(), IsValidGroup(group_id)); EnforcePrecondition(::GroupID::Invalid(), IsValidGroup(group_id));
const Group *g = ::Group::GetIfValid(group_id); const Group *g = ::Group::Get(group_id);
return g->parent; return g->parent;
} }
@ -239,7 +239,7 @@
{ {
EnforcePrecondition(ScriptCompany::Colours::COLOUR_INVALID, IsValidGroup(group_id)); 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; if (!HasBit(g->livery.in_use, 0)) return ScriptCompany::Colours::COLOUR_INVALID;
return (ScriptCompany::Colours)g->livery.colour1; return (ScriptCompany::Colours)g->livery.colour1;
} }
@ -248,7 +248,7 @@
{ {
EnforcePrecondition(ScriptCompany::Colours::COLOUR_INVALID, IsValidGroup(group_id)); 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; if (!HasBit(g->livery.in_use, 1)) return ScriptCompany::Colours::COLOUR_INVALID;
return (ScriptCompany::Colours)g->livery.colour2; return (ScriptCompany::Colours)g->livery.colour2;
} }

3
src/script/script_gui.cpp
View File

@ -813,8 +813,7 @@ struct ScriptDebugWindow : public Window {
return {}; return {};
} }
const AIInfo *info = Company::GetIfValid(this->filter.script_debug_company)->ai_info; const AIInfo *info = Company::Get(this->filter.script_debug_company)->ai_info;
assert(info != nullptr);
return GetString(STR_AI_DEBUG_NAME_AND_VERSION, info->GetName(), info->GetVersion()); return GetString(STR_AI_DEBUG_NAME_AND_VERSION, info->GetName(), info->GetVersion());
} }