From 733cad723b698151bc6c369f867821ea304a7675 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 28 Sep 2020 11:13:02 -0700 Subject: [PATCH] Remove unused attributes from entclass These attributes were `jumping` and `jumpframe`. Removal of unused attributes makes reading the code easier. --- desktop_version/src/Ent.cpp | 2 -- desktop_version/src/Ent.h | 2 -- desktop_version/src/Entity.cpp | 1 - 3 files changed, 5 deletions(-) diff --git a/desktop_version/src/Ent.cpp b/desktop_version/src/Ent.cpp index a4566a09..b6e126af 100644 --- a/desktop_version/src/Ent.cpp +++ b/desktop_version/src/Ent.cpp @@ -38,11 +38,9 @@ entclass::entclass() x2 = 320; y2 = 240; - jumping = false; gravity = false; onground = 0; onroof = 0; - jumpframe = 0; onentity = 0; harmful = false; diff --git a/desktop_version/src/Ent.h b/desktop_version/src/Ent.h index 87dd9817..96c7ee87 100644 --- a/desktop_version/src/Ent.h +++ b/desktop_version/src/Ent.h @@ -42,10 +42,8 @@ public: int onwall, onxwall, onywall; //Platforming specific - bool jumping; bool gravity; int onground, onroof; - int jumpframe; //Animation int framedelay, drawframe, walkingframe, dir, actionframe; int yp;int xp; diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 027a953d..97dde6b9 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -4446,7 +4446,6 @@ void entityclass::entitymapcollision( int t ) { if (entities[t].onwall > 0) entities[t].state = entities[t].onwall; if (entities[t].onywall > 0) entities[t].state = entities[t].onywall; - entities[t].jumpframe = 0; } }