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:
@@ -19,8 +19,8 @@ UpdateMobEffectPacket::UpdateMobEffectPacket()
|
||||
UpdateMobEffectPacket::UpdateMobEffectPacket(int entityId, MobEffectInstance *effect)
|
||||
{
|
||||
this->entityId = entityId;
|
||||
effectId = (BYTE) (effect->getId() & 0xff);
|
||||
effectAmplifier = (char) (effect->getAmplifier() & 0xff);
|
||||
effectId = static_cast<BYTE>(effect->getId() & 0xff);
|
||||
effectAmplifier = static_cast<char>(effect->getAmplifier() & 0xff);
|
||||
|
||||
if (effect->getDuration() > Short::MAX_VALUE)
|
||||
{
|
||||
@@ -28,7 +28,7 @@ UpdateMobEffectPacket::UpdateMobEffectPacket(int entityId, MobEffectInstance *ef
|
||||
}
|
||||
else
|
||||
{
|
||||
effectDurationTicks = (short) effect->getDuration();
|
||||
effectDurationTicks = static_cast<short>(effect->getDuration());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user