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:
@@ -11,9 +11,9 @@ RespawnPacket::RespawnPacket()
|
||||
this->difficulty = 1;
|
||||
this->mapSeed = 0;
|
||||
this->mapHeight = 0;
|
||||
this->playerGameType = NULL;
|
||||
this->playerGameType = nullptr;
|
||||
this->m_newSeaLevel = false;
|
||||
m_pLevelType = NULL;
|
||||
m_pLevelType = nullptr;
|
||||
m_newEntityId = 0;
|
||||
m_xzSize = LEVEL_MAX_WIDTH;
|
||||
m_hellScale = HELL_LEVEL_MAX_SCALE;
|
||||
@@ -47,7 +47,7 @@ void RespawnPacket::read(DataInputStream *dis) //throws IOException
|
||||
mapHeight = dis->readShort();
|
||||
wstring typeName = readUtf(dis, 16);
|
||||
m_pLevelType = LevelType::getLevelType(typeName);
|
||||
if (m_pLevelType == NULL)
|
||||
if (m_pLevelType == nullptr)
|
||||
{
|
||||
m_pLevelType = LevelType::lvl_normal;
|
||||
}
|
||||
@@ -68,7 +68,7 @@ void RespawnPacket::write(DataOutputStream *dos) //throws IOException
|
||||
dos->writeByte(dimension);
|
||||
dos->writeByte(playerGameType->getId());
|
||||
dos->writeShort(mapHeight);
|
||||
if (m_pLevelType == NULL)
|
||||
if (m_pLevelType == nullptr)
|
||||
{
|
||||
writeUtf(L"", dos);
|
||||
}
|
||||
@@ -89,9 +89,9 @@ void RespawnPacket::write(DataOutputStream *dos) //throws IOException
|
||||
int RespawnPacket::getEstimatedSize()
|
||||
{
|
||||
int length=0;
|
||||
if (m_pLevelType != NULL)
|
||||
if (m_pLevelType != nullptr)
|
||||
{
|
||||
length = (int)m_pLevelType->getGeneratorName().length();
|
||||
length = static_cast<int>(m_pLevelType->getGeneratorName().length());
|
||||
}
|
||||
return 13+length;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user