mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2025-01-10 19:09:45 +01:00
Remove unused x and y attributes of blockclass
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:
parent
758d201296
commit
9789848b36
3 changed files with 0 additions and 16 deletions
|
@ -23,9 +23,6 @@ void blockclass::clear(void)
|
|||
g = 0;
|
||||
b = 0;
|
||||
|
||||
x = 0.0f;
|
||||
y = 0.0f;
|
||||
|
||||
/* std::strings get initialized automatically, but this is */
|
||||
/* in case this function gets called again after construction */
|
||||
script.clear();
|
||||
|
|
|
@ -21,11 +21,6 @@ public:
|
|||
int xp, yp, wp, hp;
|
||||
std::string script, prompt;
|
||||
int r, g, b;
|
||||
|
||||
//These would come from the sprite in the flash
|
||||
float x;
|
||||
float y;
|
||||
|
||||
};
|
||||
|
||||
#endif /* BLOCKV_H */
|
||||
|
|
|
@ -800,8 +800,6 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
|
|||
break;
|
||||
case TRIGGER: //Trigger
|
||||
block.type = TRIGGER;
|
||||
block.x = xp;
|
||||
block.y = yp;
|
||||
block.wp = w;
|
||||
block.hp = 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;
|
||||
case DAMAGE: //Damage
|
||||
block.type = DAMAGE;
|
||||
block.x = xp;
|
||||
block.y = yp;
|
||||
block.wp = w;
|
||||
block.hp = h;
|
||||
block.rectset(xp, yp, w, h);
|
||||
break;
|
||||
case DIRECTIONAL: //Directional
|
||||
block.type = DIRECTIONAL;
|
||||
block.x = xp;
|
||||
block.y = yp;
|
||||
block.wp = w;
|
||||
block.hp = 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;
|
||||
case ACTIVITY: //Activity Zone
|
||||
block.type = ACTIVITY;
|
||||
block.x = xp;
|
||||
block.y = yp;
|
||||
block.wp = w;
|
||||
block.hp = h;
|
||||
block.rectset(xp, yp, w, h);
|
||||
|
|
Loading…
Reference in a new issue