Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -34,9 +34,9 @@ ExplodePacket::ExplodePacket(double x, double y, double z, float r, unordered_se
|
||||
|
||||
if (knockback != nullptr)
|
||||
{
|
||||
knockbackX = static_cast<float>(knockback->x);
|
||||
knockbackY = static_cast<float>(knockback->y);
|
||||
knockbackZ = static_cast<float>(knockback->z);
|
||||
knockbackX = (float) knockback->x;
|
||||
knockbackY = (float) knockback->y;
|
||||
knockbackZ = (float) knockback->z;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,14 +52,14 @@ void ExplodePacket::read(DataInputStream *dis) //throws IOException
|
||||
r = dis->readFloat();
|
||||
int count = dis->readInt();
|
||||
|
||||
int xp = static_cast<int>(x);
|
||||
int yp = static_cast<int>(y);
|
||||
int zp = static_cast<int>(z);
|
||||
int xp = (int)x;
|
||||
int yp = (int)y;
|
||||
int zp = (int)z;
|
||||
for (int i=0; i<count; i++)
|
||||
{
|
||||
int xx = static_cast<signed char>(dis->readByte())+xp;
|
||||
int yy = static_cast<signed char>(dis->readByte())+yp;
|
||||
int zz = static_cast<signed char>(dis->readByte())+zp;
|
||||
int xx = ((signed char)dis->readByte())+xp;
|
||||
int yy = ((signed char)dis->readByte())+yp;
|
||||
int zz = ((signed char)dis->readByte())+zp;
|
||||
toBlow.push_back( TilePos(xx, yy, zz) );
|
||||
}
|
||||
}
|
||||
@@ -79,11 +79,11 @@ void ExplodePacket::write(DataOutputStream *dos) //throws IOException
|
||||
dos->writeDouble(y);
|
||||
dos->writeDouble(z);
|
||||
dos->writeFloat(r);
|
||||
dos->writeInt(static_cast<int>(toBlow.size()));
|
||||
dos->writeInt((int)toBlow.size());
|
||||
|
||||
int xp = static_cast<int>(x);
|
||||
int yp = static_cast<int>(y);
|
||||
int zp = static_cast<int>(z);
|
||||
int xp = (int)x;
|
||||
int yp = (int)y;
|
||||
int zp = (int)z;
|
||||
|
||||
for ( const TilePos& tp : toBlow )
|
||||
{
|
||||
@@ -108,7 +108,7 @@ void ExplodePacket::handle(PacketListener *listener)
|
||||
|
||||
int ExplodePacket::getEstimatedSize()
|
||||
{
|
||||
return 8*3+4+4+static_cast<int>(toBlow.size())*3+12;
|
||||
return 8*3+4+4+(int)toBlow.size()*3+12;
|
||||
}
|
||||
|
||||
float ExplodePacket::getKnockbackX()
|
||||
|
||||
Reference in New Issue
Block a user