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:
@@ -10,13 +10,13 @@ TexturePacket::TexturePacket()
|
||||
{
|
||||
this->textureName = L"";
|
||||
this->dwBytes = 0;
|
||||
this->pbData = NULL;
|
||||
this->pbData = nullptr;
|
||||
}
|
||||
|
||||
TexturePacket::~TexturePacket()
|
||||
{
|
||||
// can't free this - it's used elsewhere
|
||||
// if(this->pbData!=NULL)
|
||||
// if(this->pbData!=nullptr)
|
||||
// {
|
||||
// delete [] this->pbData;
|
||||
// }
|
||||
@@ -37,7 +37,7 @@ void TexturePacket::handle(PacketListener *listener)
|
||||
void TexturePacket::read(DataInputStream *dis) //throws IOException
|
||||
{
|
||||
textureName = dis->readUTF();
|
||||
dwBytes = (DWORD)dis->readShort();
|
||||
dwBytes = static_cast<DWORD>(dis->readShort());
|
||||
|
||||
if(dwBytes>0)
|
||||
{
|
||||
@@ -53,7 +53,7 @@ void TexturePacket::read(DataInputStream *dis) //throws IOException
|
||||
void TexturePacket::write(DataOutputStream *dos) //throws IOException
|
||||
{
|
||||
dos->writeUTF(textureName);
|
||||
dos->writeShort((short)dwBytes);
|
||||
dos->writeShort(static_cast<short>(dwBytes));
|
||||
for(DWORD i=0;i<dwBytes;i++)
|
||||
{
|
||||
dos->writeByte(this->pbData[i]);
|
||||
|
||||
Reference in New Issue
Block a user