games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Merge pull request #596 from dydzio0614/HeroSpeedFix2

Browse Source 
Re-fix map hero movement speed, was too fast on land
This commit is contained in:
Alexander Shishkin 2019-05-28 17:52:48 +03:00 committed by GitHub
commit 4acec00aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/mapHandler.cpp
View File

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

6
client/windows/CAdvmapInterface.cpp
View File

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