mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-12 04:03:53 +00:00
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
This commit is contained in:
parent
88798b501d
commit
28614b922f
1373 changed files with 20086 additions and 19527 deletions
|
|
@ -5,13 +5,9 @@
|
|||
|
||||
|
||||
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket()
|
||||
// UpdateGameRuleProgressPacket() default constructor
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket() : m_icon(0), m_auxValue(0), m_dataTag(0)
|
||||
{
|
||||
m_messageId = L"";
|
||||
m_icon = -1;
|
||||
m_auxValue = 0;
|
||||
m_definitionType = ConsoleGameRules::eGameRuleType_LevelRules;
|
||||
m_dataTag = 0;
|
||||
}
|
||||
|
||||
UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket(ConsoleGameRules::EGameRuleType definitionType, const wstring &messageId, int icon, int auxValue, int dataTag, void *data, int dataLength)
|
||||
|
|
@ -35,7 +31,7 @@ UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket(ConsoleGameRules::EGa
|
|||
|
||||
void UpdateGameRuleProgressPacket::read(DataInputStream *dis) //throws IOException
|
||||
{
|
||||
m_definitionType = (ConsoleGameRules::EGameRuleType)dis->readInt();
|
||||
m_definitionType = static_cast<ConsoleGameRules::EGameRuleType>(dis->readInt());
|
||||
m_messageId = readUtf(dis,64);
|
||||
m_icon = dis->readInt();
|
||||
m_auxValue = dis->readByte();
|
||||
|
|
@ -71,5 +67,5 @@ void UpdateGameRuleProgressPacket::handle(PacketListener *listener)
|
|||
|
||||
int UpdateGameRuleProgressPacket::getEstimatedSize()
|
||||
{
|
||||
return (int)m_messageId.length() + 4 + m_data.length;
|
||||
return static_cast<int>(m_messageId.length()) + 4 + m_data.length;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue