Fix issue #155 (only tested on pv973)

Please let me know if pv870+ works now.
Note:
 * pv = protocol version,
 * cv = client version
For people wondering.
This commit is contained in:
BeniS 2012-12-30 20:53:24 +13:00
parent abf0ee4303
commit fcdf2286b6
2 changed files with 5 additions and 4 deletions

View File

@ -506,9 +506,10 @@ bool Game::walk(Otc::Direction direction)
return false; return false;
} }
// must add a new walk event // check we can walk and add new walk event if false
if(!m_localPlayer->canWalk(direction)) { if(!m_localPlayer->canWalk(direction)) {
if(m_lastWalkDir != direction) { if(m_lastWalkDir != direction) {
// must add a new walk event
float ticks = m_localPlayer->getStepTicksLeft(); float ticks = m_localPlayer->getStepTicksLeft();
if(ticks < 0) if(ticks < 0)
ticks = 0; ticks = 0;

View File

@ -216,9 +216,9 @@ int Item::getSubType()
{ {
if(isSplash() || isFluidContainer()) if(isSplash() || isFluidContainer())
return m_countOrSubType; return m_countOrSubType;
if(g_game.getProtocolVersion() >= 900) if(m_countOrSubType > 0 && g_game.getProtocolVersion() >= 870)
return 0; return 1;
return 1; return 0;
} }
int Item::getCount() int Item::getCount()