Project modernization (#630)
* 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
This commit is contained in:
@@ -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)];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user