gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

creature direction fix

This commit is contained in:
Henrique 2011-11-06 19:45:42 -02:00
parent aa682355fa
commit 4e0ca24cb7
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/otclient/core/creature.cpp
View File

@ -136,41 +136,41 @@ void Creature::walk(const Position& position, bool inverse)
// set new direction // set new direction
if(m_position + Position(0, -1, 0) == position) { if(m_position + Position(0, -1, 0) == position) {
m_direction = Otc::North; setDirection(Otc::North);
m_walkOffsetY = 32; m_walkOffsetY = 32;
} }
else if(m_position + Position(1, 0, 0) == position) { else if(m_position + Position(1, 0, 0) == position) {
m_direction = Otc::East; setDirection(Otc::East);
m_walkOffsetX = -32; m_walkOffsetX = -32;
} }
else if(m_position + Position(0, 1, 0) == position) { else if(m_position + Position(0, 1, 0) == position) {
m_direction = Otc::South; setDirection(Otc::South);
m_walkOffsetY = -32; m_walkOffsetY = -32;
} }
else if(m_position + Position(-1, 0, 0) == position) { else if(m_position + Position(-1, 0, 0) == position) {
m_direction = Otc::West; setDirection(Otc::West);
m_walkOffsetX = 32; m_walkOffsetX = 32;
} }
else if(m_position + Position(1, -1, 0) == position) { else if(m_position + Position(1, -1, 0) == position) {
m_direction = Otc::NorthEast; setDirection(Otc::NorthEast);
m_walkOffsetX = -32; m_walkOffsetX = -32;
m_walkOffsetY = 32; m_walkOffsetY = 32;
walkTimeFactor = 2; walkTimeFactor = 2;
} }
else if(m_position + Position(1, 1, 0) == position) { else if(m_position + Position(1, 1, 0) == position) {
m_direction = Otc::SouthEast; setDirection(Otc::SouthEast);
m_walkOffsetX = -32; m_walkOffsetX = -32;
m_walkOffsetY = -32; m_walkOffsetY = -32;
walkTimeFactor = 2; walkTimeFactor = 2;
} }
else if(m_position + Position(-1, 1, 0) == position) { else if(m_position + Position(-1, 1, 0) == position) {
m_direction = Otc::SouthWest; setDirection(Otc::SouthWest);
m_walkOffsetX = 32; m_walkOffsetX = 32;
m_walkOffsetY = -32; m_walkOffsetY = -32;
walkTimeFactor = 2; walkTimeFactor = 2;
} }
else if(m_position + Position(-1, -1, 0) == position) { else if(m_position + Position(-1, -1, 0) == position) {
m_direction = Otc::NorthWest; setDirection(Otc::NorthWest);
m_walkOffsetX = 32; m_walkOffsetX = 32;
m_walkOffsetY = 32; m_walkOffsetY = 32;
walkTimeFactor = 2; walkTimeFactor = 2;
@ -189,17 +189,6 @@ void Creature::walk(const Position& position, bool inverse)
} }
if(m_walking) { if(m_walking) {
// Calculate xPattern
if(m_direction >= 4) {
if(m_direction == Otc::NorthEast || m_direction == Otc::SouthEast)
m_xPattern = Otc::East;
else if(m_direction == Otc::NorthWest || m_direction == Otc::SouthWest)
m_xPattern = Otc::West;
}
else {
m_xPattern = m_direction;
}
// get walk speed // get walk speed
int groundSpeed = 100; int groundSpeed = 100;
@ -281,6 +270,13 @@ void Creature::setHealthPercent(uint8 healthPercent)
onHealthPercentChange(oldHealthPercent); onHealthPercentChange(oldHealthPercent);
} }
void Creature::setDirection(Otc::Direction direction)
{
Otc::Direction oldDirection = m_direction;
m_direction = direction;
onDirectionChange(oldDirection);
}
const ThingType& Creature::getType() const ThingType& Creature::getType()
{ {
return g_thingsType.getCreatureType(m_outfit.type); return g_thingsType.getCreatureType(m_outfit.type);
@ -314,3 +310,16 @@ void Creature::onHealthPercentChange(int)
m_informationColor.setRed(79); m_informationColor.setRed(79);
} }
} }
void Creature::onDirectionChange(Otc::Direction)
{
if(m_direction >= 4) {
if(m_direction == Otc::NorthEast || m_direction == Otc::SouthEast)
m_xPattern = Otc::East;
else if(m_direction == Otc::NorthWest || m_direction == Otc::SouthWest)
m_xPattern = Otc::West;
}
else {
m_xPattern = m_direction;
}
}

3
src/otclient/core/creature.h
View File

@ -47,7 +47,7 @@ public:
void setName(const std::string& name) { m_name = name; } void setName(const std::string& name) { m_name = name; }
void setHealthPercent(uint8 healthPercent); void setHealthPercent(uint8 healthPercent);
void setDirection(Otc::Direction direction) { m_direction = direction; } void setDirection(Otc::Direction direction);
void setOutfit(const Outfit& outfit) { m_outfit = outfit; } void setOutfit(const Outfit& outfit) { m_outfit = outfit; }
void setLight(const Light& light) { m_light = light; } void setLight(const Light& light) { m_light = light; }
void setSpeed(uint16 speed) { m_speed = speed; } void setSpeed(uint16 speed) { m_speed = speed; }
@ -69,6 +69,7 @@ public:
const ThingType& getType(); const ThingType& getType();
void onHealthPercentChange(int); void onHealthPercentChange(int);
void onDirectionChange(Otc::Direction);
virtual void walk(const Position& position, bool inverse = true); virtual void walk(const Position& position, bool inverse = true);
virtual void cancelWalk(Otc::Direction direction); virtual void cancelWalk(Otc::Direction direction);