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:
@@ -15,7 +15,7 @@ GameCommandPacket::GameCommandPacket(EGameCommand command, byteArray data)
|
||||
this->data = data;
|
||||
length = 0;
|
||||
|
||||
if (data.data != NULL)
|
||||
if (data.data != nullptr)
|
||||
{
|
||||
length = data.length;
|
||||
|
||||
@@ -37,12 +37,12 @@ GameCommandPacket::~GameCommandPacket()
|
||||
|
||||
void GameCommandPacket::read(DataInputStream *dis)
|
||||
{
|
||||
command = (EGameCommand)dis->readInt();
|
||||
command = static_cast<EGameCommand>(dis->readInt());
|
||||
length = dis->readShort();
|
||||
|
||||
if (length > 0 && length < Short::MAX_VALUE)
|
||||
{
|
||||
if(data.data != NULL)
|
||||
if(data.data != nullptr)
|
||||
{
|
||||
delete [] data.data;
|
||||
}
|
||||
@@ -54,8 +54,8 @@ void GameCommandPacket::read(DataInputStream *dis)
|
||||
void GameCommandPacket::write(DataOutputStream *dos)
|
||||
{
|
||||
dos->writeInt(command);
|
||||
dos->writeShort((short) length);
|
||||
if (data.data != NULL)
|
||||
dos->writeShort(static_cast<short>(length));
|
||||
if (data.data != nullptr)
|
||||
{
|
||||
dos->write(data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user