a9be52c41a
* 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
42 lines
1.2 KiB
C++
42 lines
1.2 KiB
C++
#include "stdafx.h"
|
|
#include "SuspendedParticle.h"
|
|
#include "..\Minecraft.World\Random.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.h"
|
|
#include "..\Minecraft.World\JavaMath.h"
|
|
#include "..\Minecraft.World\Mth.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.material.h"
|
|
|
|
SuspendedParticle::SuspendedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x, y - 2 / 16.0f, z, xa, ya, za)
|
|
{
|
|
// 4J-JEV: Set particle colour from colour-table.
|
|
unsigned int col = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Particle_Suspend );
|
|
rCol = ( (col>>16)&0xFF )/255.0f, gCol = ( (col>>8)&0xFF )/255.0, bCol = ( col&0xFF )/255.0;
|
|
|
|
//rCol = 0.4f;
|
|
//gCol = 0.4f;
|
|
//bCol = 0.7f;
|
|
|
|
setMiscTex(0);
|
|
this->setSize(0.01f, 0.01f);
|
|
|
|
size = size * (random->nextFloat() * 0.6f + 0.2f);
|
|
|
|
xd = xa * 0.0f;
|
|
yd = ya * 0.0f;
|
|
zd = za * 0.0f;
|
|
|
|
lifetime = static_cast<int>(16 / (Math::random() * 0.8 + 0.2));
|
|
}
|
|
|
|
void SuspendedParticle::tick()
|
|
{
|
|
xo = x;
|
|
yo = y;
|
|
zo = z;
|
|
|
|
move(xd, yd, zd);
|
|
|
|
if (level->getMaterial(Mth::floor(x), Mth::floor(y), Mth::floor(z)) != Material::water) remove();
|
|
|
|
if (lifetime-- <= 0) remove();
|
|
} |