diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EnchantmentTableParticle.cpp similarity index 80% rename from Minecraft.Client/EchantmentTableParticle.cpp rename to Minecraft.Client/EnchantmentTableParticle.cpp index 95bd3dbc7..3888a345a 100644 --- a/Minecraft.Client/EchantmentTableParticle.cpp +++ b/Minecraft.Client/EnchantmentTableParticle.cpp @@ -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; @@ -26,7 +26,7 @@ EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double setMiscTex( static_cast(Math::random() * 26 + 1 + 14 * 16) ); } -int EchantmentTableParticle::getLightColor(float a) +int EnchantmentTableParticle::getLightColor(float a) { int br = Particle::getLightColor(a); @@ -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(lifetime); @@ -50,7 +50,7 @@ float EchantmentTableParticle::getBrightness(float a) return br * (1 - pos) + pos; } -void EchantmentTableParticle::tick() +void EnchantmentTableParticle::tick() { xo = x; yo = y; @@ -68,4 +68,4 @@ void EchantmentTableParticle::tick() z = zStart + zd * pos; if (age++ >= lifetime) remove(); -} \ No newline at end of file +} diff --git a/Minecraft.Client/EchantmentTableParticle.h b/Minecraft.Client/EnchantmentTableParticle.h similarity index 65% rename from Minecraft.Client/EchantmentTableParticle.h rename to Minecraft.Client/EnchantmentTableParticle.h index 98b027c60..86759ad54 100644 --- a/Minecraft.Client/EchantmentTableParticle.h +++ b/Minecraft.Client/EnchantmentTableParticle.h @@ -4,7 +4,7 @@ class Level; -class EchantmentTableParticle : public Particle +class EnchantmentTableParticle : public Particle { private: float oSize; @@ -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(); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp index cf2937f4f..fefc004ad 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -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" diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index 23b754fa9..3f469690a 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -1840,7 +1840,7 @@ net\minecraft\client\particle - + net\minecraft\client\particle @@ -4587,7 +4587,7 @@ net\minecraft\client\particle - + net\minecraft\client\particle @@ -6316,4 +6316,4 @@ - \ No newline at end of file + diff --git a/cmake/ClientSources.cmake b/cmake/ClientSources.cmake index 6467a243c..b2567af12 100644 --- a/cmake/ClientSources.cmake +++ b/cmake/ClientSources.cmake @@ -275,7 +275,7 @@ set(MINECRAFT_CLIENT_SOURCES "DragonBreathParticle.cpp" "DragonModel.cpp" "DripParticle.cpp" - "EchantmentTableParticle.cpp" + "EnchantmentTableParticle.cpp" "EditBox.cpp" "EnchantTableRenderer.cpp" "EnderChestRenderer.cpp"