aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/Colours/ColourTable.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/Common/Colours/ColourTable.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/Common/Colours/ColourTable.cpp')
-rw-r--r--Minecraft.Client/Common/Colours/ColourTable.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp
index fa1e9d69..07326b8c 100644
--- a/Minecraft.Client/Common/Colours/ColourTable.cpp
+++ b/Minecraft.Client/Common/Colours/ColourTable.cpp
@@ -325,7 +325,7 @@ void ColourTable::staticCtor()
{
for(unsigned int i = eMinecraftColour_NOT_SET; i < eMinecraftColour_COUNT; ++i)
{
- s_colourNamesMap.insert( unordered_map<wstring,eMinecraftColour>::value_type( ColourTableElements[i], (eMinecraftColour)i) );
+ s_colourNamesMap.insert( unordered_map<wstring,eMinecraftColour>::value_type( ColourTableElements[i], static_cast<eMinecraftColour>(i)) );
}
}
@@ -366,7 +366,7 @@ void ColourTable::setColour(const wstring &colourName, int value)
auto it = s_colourNamesMap.find(colourName);
if(it != s_colourNamesMap.end())
{
- m_colourValues[(int)it->second] = value;
+ m_colourValues[static_cast<int>(it->second)] = value;
}
}
@@ -377,5 +377,5 @@ void ColourTable::setColour(const wstring &colourName, const wstring &value)
unsigned int ColourTable::getColour(eMinecraftColour id)
{
- return m_colourValues[(int)id];
+ return m_colourValues[static_cast<int>(id)];
}