games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Rename boats

Browse Source
This commit is contained in:
nordsoft
2023-04-20 21:20:51 +04:00
parent 9dbac414fc
commit de159df481
27 changed files with 61 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mapView/MapRenderer.cpp
View File

@@ -393,11 +393,11 @@ std::shared_ptr<CAnimation> MapRendererObjects::getBaseAnimation(const CGObjectI
return std::shared_ptr<CAnimation>();
}
bool generateMovementGroups = (info->id == Obj::TRANSPORT) || (info->id == Obj::HERO);
bool generateMovementGroups = (info->id == Obj::BOAT) || (info->id == Obj::HERO);
// Boat appearance files only contain single, unanimated image
// proper boat animations are actually in different file
if (info->id == Obj::TRANSPORT)
if (info->id == Obj::BOAT)
if(auto boat = dynamic_cast<const CGBoat*>(obj); boat && !boat->actualAnimation.empty())
return getAnimation(boat->actualAnimation, generateMovementGroups);
@@ -442,7 +442,7 @@ std::shared_ptr<CAnimation> MapRendererObjects::getFlagAnimation(const CGObjectI
return getAnimation(heroFlags[obj->tempOwner.getNum()], true);
}
if(obj->ID == Obj::TRANSPORT)
if(obj->ID == Obj::BOAT)
{
const auto * boat = dynamic_cast<const CGBoat *>(obj);
if(boat && boat->hero && !boat->flagAnimations[boat->hero->tempOwner.getNum()].empty())
@@ -454,7 +454,7 @@ std::shared_ptr<CAnimation> MapRendererObjects::getFlagAnimation(const CGObjectI
std::shared_ptr<CAnimation> MapRendererObjects::getOverlayAnimation(const CGObjectInstance * obj)
{
if(obj->ID == Obj::TRANSPORT)
if(obj->ID == Obj::BOAT)
{
// Boats have additional animation with waves around boat
const auto * boat = dynamic_cast<const CGBoat *>(obj);