Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "..\Minecraft.World\JavaMath.h"
#include "EchantmentTableParticle.h"
#include "EnchantmentTableParticle.h"

EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
EchantmentTableParticle::EnchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
{
this->xd = xd;
this->yd = yd;
Expand All @@ -26,7 +26,7 @@ EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double
setMiscTex( static_cast<int>(Math::random() * 26 + 1 + 14 * 16) );
}

int EchantmentTableParticle::getLightColor(float a)
int EnchantmentTableParticle::getLightColor(float a)
{
int br = Particle::getLightColor(a);

Expand All @@ -41,7 +41,7 @@ int EchantmentTableParticle::getLightColor(float a)
return br1 | br2 << 16;
}

float EchantmentTableParticle::getBrightness(float a)
float EnchantmentTableParticle::getBrightness(float a)
{
float br = Particle::getBrightness(a);
float pos = age / static_cast<float>(lifetime);
Expand All @@ -50,7 +50,7 @@ float EchantmentTableParticle::getBrightness(float a)
return br * (1 - pos) + pos;
}

void EchantmentTableParticle::tick()
void EnchantmentTableParticle::tick()
{
xo = x;
yo = y;
Expand All @@ -68,4 +68,4 @@ void EchantmentTableParticle::tick()
z = zStart + zd * pos;

if (age++ >= lifetime) remove();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class Level;

class EchantmentTableParticle : public Particle
class EnchantmentTableParticle : public Particle
{
private:
float oSize;
Expand All @@ -13,9 +13,9 @@ class EchantmentTableParticle : public Particle
public:
virtual eINSTANCEOF GetType() { return eTYPE_ENCHANTMENTTABLEPARTICLE; }

EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd);
EnchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd);

virtual int getLightColor(float a);
virtual float getBrightness(float a);
virtual void tick();
};
};
2 changes: 1 addition & 1 deletion Minecraft.Client/LevelRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "TerrainParticle.h"
#include "SpellParticle.h"
#include "DripParticle.h"
#include "EchantmentTableParticle.h"
#include "EnchantmentTableParticle.h"
#include "DragonBreathParticle.h"
#include "FireworksParticles.h"
#include "Lighting.h"
Expand Down
6 changes: 3 additions & 3 deletions Minecraft.Client/Minecraft.Client.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,7 @@
<ClInclude Include="DripParticle.h">
<Filter>net\minecraft\client\particle</Filter>
</ClInclude>
<ClInclude Include="EchantmentTableParticle.h">
<ClInclude Include="EnchantmentTableParticle.h">
<Filter>net\minecraft\client\particle</Filter>
</ClInclude>
<ClInclude Include="ModelPart.h">
Expand Down Expand Up @@ -4587,7 +4587,7 @@
<ClCompile Include="DripParticle.cpp">
<Filter>net\minecraft\client\particle</Filter>
</ClCompile>
<ClCompile Include="EchantmentTableParticle.cpp">
<ClCompile Include="EnchantmentTableParticle.cpp">
<Filter>net\minecraft\client\particle</Filter>
</ClCompile>
<ClCompile Include="SpellParticle.cpp">
Expand Down Expand Up @@ -6316,4 +6316,4 @@
<ItemGroup>
<AppxManifest Include="Durango\Autogenerated.appxmanifest" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion cmake/ClientSources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ set(MINECRAFT_CLIENT_SOURCES
"DragonBreathParticle.cpp"
"DragonModel.cpp"
"DripParticle.cpp"
"EchantmentTableParticle.cpp"
"EnchantmentTableParticle.cpp"
"EditBox.cpp"
"EnchantTableRenderer.cpp"
"EnderChestRenderer.cpp"
Expand Down
Loading