Skip to content

Commit

Permalink
Add const to function parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fulgen301
Fulgen301 committed Sep 17, 2024
1 parent 9421ab9 commit 624101e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
28 changes: 14 additions & 14 deletions src/C4HudBars.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <format>

void C4HudBar::CompileFunc(StdCompiler *comp)
void C4HudBar::CompileFunc(StdCompiler *const comp)
{
comp->Value(mkNamingAdapt(Value, "Value", 0));
comp->Value(mkNamingAdapt(Max, "Max", Maximum));
Expand All @@ -43,7 +43,7 @@ C4HudBars::C4HudBars(std::shared_ptr<const C4HudBarsDef> def) noexcept : def{std
}
}

C4HudBar *C4HudBars::BarVal(const char *functionName, const std::string &name)
C4HudBar *C4HudBars::BarVal(const char *const functionName, const std::string &name)
{
try
{
Expand All @@ -64,14 +64,14 @@ C4HudBar *C4HudBars::BarVal(const char *functionName, const std::string &name)
}
}

void C4HudBars::SetHudBarValue(const std::string &name, std::int32_t value, std::int32_t max)
void C4HudBars::SetHudBarValue(const std::string &name, const std::int32_t value, const std::int32_t max)
{
const auto barval = BarVal("SetHudBarValue", name);
barval->Value = value;
if(max > 0) barval->Max = max;
}

void C4HudBars::SetHudBarVisibility(const std::string &name, bool visible)
void C4HudBars::SetHudBarVisibility(const std::string &name, const bool visible)
{
const auto barval = BarVal("SetHudBarVisibility", name);
barval->Visible = visible;
Expand Down Expand Up @@ -170,7 +170,7 @@ C4HudBarDef::C4HudBarDef() noexcept :
valueIndex{-1}, value{0}, max{C4HudBar::Maximum}, visible{true}, scale{1.0f}
{}

C4HudBarDef::C4HudBarDef(std::string_view name, std::string_view gfx, std::shared_ptr<C4FacetExID> facet, std::int32_t index, Physical physical) :
C4HudBarDef::C4HudBarDef(const std::string_view name, const std::string_view gfx, std::shared_ptr<C4FacetExID> facet, const std::int32_t index, const Physical physical) :
name{name}, physical{physical}, hide{DefaultHide(physical)},
gfx{gfx}, facet{std::move(facet)}, index{index}, advance{true},
valueIndex{-1}, value{0}, max{C4HudBar::Maximum}, visible{true}, scale{1.0f}
Expand All @@ -191,7 +191,7 @@ bool C4HudBarDef::operator==(const C4HudBarDef &rhs) const noexcept
visible == rhs.visible;
}

C4HudBarDef::Hide C4HudBarDef::DefaultHide(C4HudBarDef::Physical physical) noexcept
C4HudBarDef::Hide C4HudBarDef::DefaultHide(const C4HudBarDef::Physical physical) noexcept
{
switch (physical)
{
Expand All @@ -207,7 +207,7 @@ C4HudBarDef::Hide C4HudBarDef::DefaultHide(C4HudBarDef::Physical physical) noexc
}
}

int32_t C4HudBarDef::DefaultIndex(C4HudBarDef::Physical physical) noexcept
int32_t C4HudBarDef::DefaultIndex(const C4HudBarDef::Physical physical) noexcept
{
switch (physical)
{
Expand Down Expand Up @@ -240,7 +240,7 @@ std::size_t C4HudBarDef::GetHash() const noexcept
return result;
}

void C4HudBarDef::CompileFunc(StdCompiler *comp)
void C4HudBarDef::CompileFunc(StdCompiler *const comp)
{
comp->Value(mkNamingAdapt(name, "Name"));
StdEnumEntry<Physical> PhysicalEntries[]
Expand Down Expand Up @@ -283,7 +283,7 @@ namespace

C4HudBarsDef::Gfx::Gfx() noexcept : key{}, file{}, amount{0}, scale{0} {}

C4HudBarsDef::Gfx::Gfx(std::string key, std::string file, std::int32_t amount, std::int32_t scale) noexcept
C4HudBarsDef::Gfx::Gfx(std::string key, std::string file, const std::int32_t amount, const std::int32_t scale) noexcept
: key{std::move(key)},
file{std::move(file)},
amount{amount},
Expand All @@ -295,7 +295,7 @@ bool C4HudBarsDef::Gfx::operator==(const Gfx &rhs) const noexcept
return key == rhs.key && file == rhs.file && amount == rhs.amount && scale == rhs.scale;
}

void C4HudBarsDef::Gfx::CompileFunc(StdCompiler *comp)
void C4HudBarsDef::Gfx::CompileFunc(StdCompiler *const comp)
{
comp->Value(mkNamingAdapt(key, "Key"));
comp->Value(mkNamingAdapt(file, "File"));
Expand Down Expand Up @@ -380,7 +380,7 @@ std::shared_ptr<C4HudBars> C4HudBarsUniquifier::DefaultBars()
return defaultBars;
}

std::shared_ptr<C4FacetExID> C4HudBarsUniquifier::GetFacet(const std::function<void(std::string)> &error, const C4HudBarsDef::Gfxs &gfxs, std::string_view gfx)
std::shared_ptr<C4FacetExID> C4HudBarsUniquifier::GetFacet(const std::function<void(std::string)> &error, const C4HudBarsDef::Gfxs &gfxs, const std::string_view gfx)
{
const std::string key{gfx};

Expand Down Expand Up @@ -540,7 +540,7 @@ void C4HudBarsUniquifier::ProcessGraphics(C4ValueHash &map, C4HudBarsDef::Gfxs &
}
}

void C4HudBarsUniquifier::ProcessGroup(std::int32_t &valueIndex, const C4HudBarsDef::Gfxs &graphics, const C4ValueArray &group, C4HudBarsDef::Bars &bars, bool advanceAlways)
void C4HudBarsUniquifier::ProcessGroup(std::int32_t &valueIndex, const C4HudBarsDef::Gfxs &graphics, const C4ValueArray &group, C4HudBarsDef::Bars &bars, const bool advanceAlways)
{
const auto error = [](const char *msg, const C4Value &val)
{
Expand Down Expand Up @@ -590,7 +590,7 @@ void C4HudBarsUniquifier::ProcessGroup(std::int32_t &valueIndex, const C4HudBars
}
}

void C4HudBarsUniquifier::ProcessHudBar(std::int32_t &valueIndex, const C4HudBarsDef::Gfxs &graphics, const C4ValueHash &bar, C4HudBarsDef::Bars &bars, bool advance)
void C4HudBarsUniquifier::ProcessHudBar(std::int32_t &valueIndex, const C4HudBarsDef::Gfxs &graphics, const C4ValueHash &bar, C4HudBarsDef::Bars &bars, const bool advance)
{
auto name = bar[C4VString("name")];
const auto *_name = name.getStr();
Expand Down Expand Up @@ -673,7 +673,7 @@ void C4HudBarsUniquifier::ProcessHudBar(std::int32_t &valueIndex, const C4HudBar
}


void C4HudBarsAdapt::CompileFunc(StdCompiler *comp)
void C4HudBarsAdapt::CompileFunc(StdCompiler *const comp)
{
if (!comp->isCompiler())
{
Expand Down
4 changes: 2 additions & 2 deletions src/C4Object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2712,12 +2712,12 @@ bool C4Object::DefineHudBars(C4ValueHash *graphics, C4ValueArray *definition)
return false;
}

void C4Object::SetHudBarValue(const char *name, int32_t value, int32_t max)
void C4Object::SetHudBarValue(const char *const name, const int32_t value, const int32_t max)
{
hudBars->SetHudBarValue(name, value, max);
}

void C4Object::SetHudBarVisibility(const char *name, bool visible)
void C4Object::SetHudBarVisibility(const char *const name, const bool visible)
{
hudBars->SetHudBarVisibility(name, visible);
}
Expand Down
6 changes: 3 additions & 3 deletions src/C4Script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@ static bool FnSetMenuTextProgress(C4AulContext *cthr, C4ValueInt iNewProgress, C

// Custom Energy Bars

static bool FnDefineHudBars(C4AulContext *cthr, C4ValueHash *graphics, C4ValueArray *bars)
static bool FnDefineHudBars(C4AulContext *const cthr, C4ValueHash *const graphics, C4ValueArray *const bars)
{
const auto obj = cthr->Obj;
if (!obj) return false;
Expand All @@ -1777,7 +1777,7 @@ static bool FnDefineHudBars(C4AulContext *cthr, C4ValueHash *graphics, C4ValueAr
}
}

static void FnSetHudBarValue(C4AulContext *cthr, C4String *name, C4ValueInt newValue, C4ValueInt newMax)
static void FnSetHudBarValue(C4AulContext *const cthr, C4String *const name, const C4ValueInt newValue, const C4ValueInt newMax)
{
const auto obj = cthr->Obj;
if (!obj) return;
Expand All @@ -1792,7 +1792,7 @@ static void FnSetHudBarValue(C4AulContext *cthr, C4String *name, C4ValueInt newV
}
}

static void FnSetHudBarVisibility(C4AulContext *cthr, C4String *name, bool visible)
static void FnSetHudBarVisibility(C4AulContext *const cthr, C4String *const name, const bool visible)
{
const auto obj = cthr->Obj;
if (!obj) return;
Expand Down

0 comments on commit 624101e

Please sign in to comment.