aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/EntityRenderDispatcher.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/EntityRenderDispatcher.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/EntityRenderDispatcher.cpp')
-rw-r--r--Minecraft.Client/EntityRenderDispatcher.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp
index 57fdcc47..01972e56 100644
--- a/Minecraft.Client/EntityRenderDispatcher.cpp
+++ b/Minecraft.Client/EntityRenderDispatcher.cpp
@@ -87,7 +87,7 @@ double EntityRenderDispatcher::xOff = 0.0;
double EntityRenderDispatcher::yOff = 0.0;
double EntityRenderDispatcher::zOff = 0.0;
-EntityRenderDispatcher *EntityRenderDispatcher::instance = NULL;
+EntityRenderDispatcher *EntityRenderDispatcher::instance = nullptr;
void EntityRenderDispatcher::staticCtor()
{
@@ -222,7 +222,7 @@ void EntityRenderDispatcher::prepare(Level *level, Textures *textures, Font *fon
int data = level->getData(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
int direction = data & 3;
- playerRotY = (float)(direction * 90 + 180);
+ playerRotY = static_cast<float>(direction * 90 + 180);
playerRotX = 0;
}
} else {
@@ -245,6 +245,11 @@ void EntityRenderDispatcher::prepare(Level *level, Textures *textures, Font *fon
void EntityRenderDispatcher::render(shared_ptr<Entity> entity, float a)
{
+ if (entity == nullptr)
+ {
+ return;
+ }
+
double x = entity->xOld + (entity->x - entity->xOld) * a;
double y = entity->yOld + (entity->y - entity->yOld) * a;
double z = entity->zOld + (entity->z - entity->zOld) * a;
@@ -281,7 +286,7 @@ void EntityRenderDispatcher::render(shared_ptr<Entity> entity, float a)
void EntityRenderDispatcher::render(shared_ptr<Entity> entity, double x, double y, double z, float rot, float a, bool bItemFrame, bool bRenderPlayerShadow)
{
EntityRenderer *renderer = getRenderer(entity);
- if (renderer != NULL)
+ if (renderer != nullptr)
{
renderer->SetItemFrame(bItemFrame);