diff --git a/desktop_version/src/BlockV.cpp b/desktop_version/src/BlockV.cpp index a653b5b4..1817c40a 100644 --- a/desktop_version/src/BlockV.cpp +++ b/desktop_version/src/BlockV.cpp @@ -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(); diff --git a/desktop_version/src/BlockV.h b/desktop_version/src/BlockV.h index 579f3e10..6753f913 100644 --- a/desktop_version/src/BlockV.h +++ b/desktop_version/src/BlockV.h @@ -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 */ diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 47e95f55..3fd12afd 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -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);