mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-10 19:09:45 +01:00
Code Issues Releases Wiki Activity

Remove unused x and y attributes of blockclass

Browse source 
These float attributes are assigned to, and then never read again. The
coordinate systems of blocks are a bit of a mess - some use xp/yp, some
use xp/yp and rect.x/rect.y - but I can confidently say that these are
never used, because it compiles fine if I remove the attributes from the
class, plus remove all assignments to it.
This commit is contained in:
Misa 2021-02-27 14:56:32 -08:00 committed by Ethan Lee
parent 758d201296
commit 9789848b36
3 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/BlockV.cpp
View file

@ -23,9 +23,6 @@ void blockclass::clear(void)
g = 0; g = 0;
b = 0; b = 0;
x = 0.0f;
y = 0.0f;
/* std::strings get initialized automatically, but this is */ /* std::strings get initialized automatically, but this is */
/* in case this function gets called again after construction */ /* in case this function gets called again after construction */
script.clear(); script.clear();

5
desktop_version/src/BlockV.h
View file

@ -21,11 +21,6 @@ public:
int xp, yp, wp, hp; int xp, yp, wp, hp;
std::string script, prompt; std::string script, prompt;
int r, g, b; int r, g, b;
//These would come from the sprite in the flash
float x;
float y;
}; };
#endif /* BLOCKV_H */ #endif /* BLOCKV_H */

8
desktop_version/src/Entity.cpp
View file

@ -800,8 +800,6 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
break; break;
case TRIGGER: //Trigger case TRIGGER: //Trigger
block.type = TRIGGER; block.type = TRIGGER;
block.x = xp;
block.y = yp;
block.wp = w; block.wp = w;
block.hp = h; block.hp = h;
block.rectset(xp, yp, w, h); block.rectset(xp, yp, w, h);
@ -810,16 +808,12 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
break; break;
case DAMAGE: //Damage case DAMAGE: //Damage
block.type = DAMAGE; block.type = DAMAGE;
block.x = xp;
block.y = yp;
block.wp = w; block.wp = w;
block.hp = h; block.hp = h;
block.rectset(xp, yp, w, h); block.rectset(xp, yp, w, h);
break; break;
case DIRECTIONAL: //Directional case DIRECTIONAL: //Directional
block.type = DIRECTIONAL; block.type = DIRECTIONAL;
block.x = xp;
block.y = yp;
block.wp = w; block.wp = w;
block.hp = h; block.hp = h;
block.rectset(xp, yp, w, h); block.rectset(xp, yp, w, h);
@ -835,8 +829,6 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
break; break;
case ACTIVITY: //Activity Zone case ACTIVITY: //Activity Zone
block.type = ACTIVITY; block.type = ACTIVITY;
block.x = xp;
block.y = yp;
block.wp = w; block.wp = w;
block.hp = h; block.hp = h;
block.rectset(xp, yp, w, h); block.rectset(xp, yp, w, h);