Commit f9f7a2d7 authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Cleanups

parent 608deebe
......@@ -19,10 +19,10 @@ A_FLAG_FLIP = 4
};
const Uint16 FLYING_BASEFRAME_EP4 = 174;
const Uint16 FLYING_BASEFRAME_EP5 = 173;
//const Uint16 FLYING_BASEFRAME_EP4 = 174;
//const Uint16 FLYING_BASEFRAME_EP5 = 173;
const Uint16 ANIMATION_TIME = 8;
//const Uint16 ANIMATION_TIME = 8;
const Uint16 SPEED = 64;
CFlag::CFlag(CMap *pmap, const Vector2D<Uint32> &Location,
......@@ -74,8 +74,8 @@ void CFlag::serialize(boost::property_tree::ptree &node)
void CFlag::deserialize(boost::property_tree::ptree &node)
{
auto &posNode = node.put("position", "");
m_Pos.x = posNode.get<Uint32>("<xmlattr>.x", m_Pos.x);
m_Pos.y = posNode.get<Uint32>("<xmlattr>.y", m_Pos.y);
m_Pos.x = posNode.get<int>("<xmlattr>.x", m_Pos.x);
m_Pos.y = posNode.get<int>("<xmlattr>.y", m_Pos.y);
}
void CFlag::deserialize(CSaveGameController &savedGame)
......
......@@ -21,7 +21,6 @@ constexpr int Y_DIST_TO_LICK = 8<<CSF;
CCeilick::CCeilick(CMap* pmap, const Uint16 foeID, const Uint32 x, const Uint32 y) :
CStunnable(pmap, foeID, x, y),
mTimer(0),
mChanceToLick(false),
mCrawlPos(0),
mLaughed(false)
......@@ -138,10 +137,10 @@ void CCeilick::draw()
if( scrx < gameres.w && scry < gameres.h && exists )
{
Uint16 showX = scrx+Sprite.getXOffset();
int showX = scrx+Sprite.getXOffset();
// Here we use the crawl effect to smoothen the movement of the ceilick.
Uint16 showY = scry + mCrawlPos;
int showY = scry + mCrawlPos;
if(mCrawlPos < 0)
mCrawlPos++;
......
......@@ -30,7 +30,7 @@ public:
void draw();
private:
int mTimer;
//int mTimer;
bool mChanceToLick;
int mCrawlPos;
bool mLaughed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment