1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Re-fix map hero movement speed, was too fast on land

This commit is contained in:
Dydzio 2019-05-26 17:11:57 +02:00
parent 54bbf2abb3
commit 5470f9cafe
2 changed files with 9 additions and 7 deletions

View File

@ -770,14 +770,12 @@ void CMapHandler::CMapBlitter::drawObjects(SDL_Surface * targetSurf, const Terra
if (!canDrawObject(obj))
continue;
uint8_t animationFrame = info->anim;
uint8_t animationFrame;
if(obj->ID == Obj::HERO) //non-generic animation frame pick for hero and boat
{
animationFrame = info->heroAnim;
const CGHeroInstance * hero = dynamic_cast<const CGHeroInstance *>(obj);
if(hero->boat)
animationFrame /= 2;
}
else
animationFrame = info->anim;
auto objData = findObjectBitmap(obj, animationFrame);
if (objData.objBitmap)
{

View File

@ -1029,6 +1029,11 @@ void CAdvMapInt::show(SDL_Surface * to)
return;
++animValHitCount; //for animations
if(animValHitCount % 2 == 0)
{
++heroAnim;
}
if(animValHitCount == 8)
{
CGI->mh->updateWater();
@ -1036,7 +1041,6 @@ void CAdvMapInt::show(SDL_Surface * to)
++anim;
updateScreen = true;
}
++heroAnim;
if(swipeEnabled)
{