games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Remove custom casts

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-14 12:56:37 +02:00
parent 0d74959a33
commit c23953eac5
14 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/Nullkiller/AIGateway.cpp
View File

@@ -1407,7 +1407,7 @@ void AIGateway::tryRealize(Goals::Trade & g) //trade
int accquiredResources = 0;
if(const CGObjectInstance * obj = cb->getObj(ObjectInstanceID(g.objid), false))
{
if(const IMarket * m = IMarket::castFrom(obj, false))
if(const auto * m = dynamic_cast<const IMarket*>(obj))
{
auto freeRes = cb->getResourceAmount(); //trade only resources which are not reserved
for(auto it = ResourceSet::nziterator(freeRes); it.valid(); it++)

2
AI/Nullkiller/Pathfinding/Rules/AILayerTransitionRule.cpp
View File

@@ -131,7 +131,7 @@ namespace AIPathfinding
{
if(obj->ID != Obj::TOWN) //towns were handled in the previous loop
{
if(const IShipyard * shipyard = IShipyard::castFrom(obj))
if(const auto * shipyard = dynamic_cast<const IShipyard *>(obj))
shipyards.push_back(shipyard);
}
}

4
AI/VCAI/Goals/CollectRes.cpp
View File

@@ -124,7 +124,9 @@ TSubgoal CollectRes::whatToDoToTrade()
ai->retrieveVisitableObjs(visObjs, true);
for(const CGObjectInstance * obj : visObjs)
{
if(const IMarket * m = IMarket::castFrom(obj, false); m && m->allowsTrade(EMarketMode::RESOURCE_RESOURCE))
const auto * m = dynamic_cast<const IMarket*>(obj);
if(m && m->allowsTrade(EMarketMode::RESOURCE_RESOURCE))
{
if(obj->ID == Obj::TOWN)
{

2
AI/VCAI/Pathfinding/Rules/AILayerTransitionRule.cpp
View File

@@ -58,7 +58,7 @@ namespace AIPathfinding
{
if(obj->ID != Obj::TOWN) //towns were handled in the previous loop
{
if(const IShipyard * shipyard = IShipyard::castFrom(obj))
if(const auto * shipyard = dynamic_cast<const IShipyard *>(obj))
shipyards.push_back(shipyard);
}
}

2
AI/VCAI/VCAI.cpp
View File

@@ -2134,7 +2134,7 @@ void VCAI::tryRealize(Goals::Trade & g) //trade
int accquiredResources = 0;
if(const CGObjectInstance * obj = cb->getObj(ObjectInstanceID(g.objid), false))
{
if(const IMarket * m = IMarket::castFrom(obj, false))
if(const auto * m = dynamic_cast<const IMarket*>(obj))
{
auto freeRes = ah->freeResources(); //trade only resources which are not reserved
for(auto it = ResourceSet::nziterator(freeRes); it.valid(); it++)

7
Global.h
View File

@@ -695,8 +695,11 @@ namespace vstd
template<typename Floating1, typename Floating2>
bool isAlmostEqual(const Floating1 & left, const Floating2 & right)
{
const auto relativeEpsilon = std::max(std::abs(left), std::abs(right)) * 0.00001;
return std::abs(left - right) <= relativeEpsilon;
using Floating = decltype(left + right);
constexpr Floating epsilon(0.00001);
const Floating relativeEpsilon = std::max(std::abs(left), std::abs(right)) * epsilon;
const Floating value = std::abs(left - right);
return value <= relativeEpsilon;
}
///compile-time version of std::abs for ints for int3, in clang++15 std::abs is constexpr

6
client/NetPacksClient.cpp
View File

@@ -958,7 +958,7 @@ void ApplyClientNetPackVisitor::visitOpenWindow(OpenWindow & pack)
case EOpenWindowMode::SHIPYARD_WINDOW:
{
assert(pack.queryID == QueryID::NONE);
const IShipyard *sy = IShipyard::castFrom(cl.getObj(ObjectInstanceID(pack.object)));
const auto * sy = dynamic_cast<const IShipyard *>(cl.getObj(ObjectInstanceID(pack.object)));
callInterfaceIfPresent(cl, sy->getObject()->getOwner(), &IGameEventsReceiver::showShipyardDialog, sy);
}
break;
@@ -974,7 +974,7 @@ void ApplyClientNetPackVisitor::visitOpenWindow(OpenWindow & pack)
case EOpenWindowMode::UNIVERSITY_WINDOW:
{
//displays University window (when hero enters University on adventure map)
const IMarket *market = IMarket::castFrom(cl.getObj(ObjectInstanceID(pack.object)));
const auto * market = dynamic_cast<const IMarket*>(cl.getObj(ObjectInstanceID(pack.object)));
const CGHeroInstance *hero = cl.getHero(ObjectInstanceID(pack.visitor));
callInterfaceIfPresent(cl, hero->tempOwner, &IGameEventsReceiver::showUniversityWindow, market, hero, pack.queryID);
}
@@ -984,7 +984,7 @@ void ApplyClientNetPackVisitor::visitOpenWindow(OpenWindow & pack)
//displays Thieves' Guild window (when hero enters Den of Thieves)
const CGObjectInstance *obj = cl.getObj(ObjectInstanceID(pack.object));
const CGHeroInstance *hero = cl.getHero(ObjectInstanceID(pack.visitor));
const IMarket *market = IMarket::castFrom(obj);
const auto *market = dynamic_cast<const IMarket*>(obj);
callInterfaceIfPresent(cl, cl.getTile(obj->visitablePos())->visitableObjects.back()->tempOwner, &IGameEventsReceiver::showMarketWindow, market, hero, pack.queryID);
}
break;

2
client/adventureMap/AdventureMapInterface.cpp
View File

@@ -852,7 +852,7 @@ Rect AdventureMapInterface::terrainAreaPixels() const
const IShipyard * AdventureMapInterface::ourInaccessibleShipyard(const CGObjectInstance *obj) const
{
const IShipyard *ret = IShipyard::castFrom(obj);
const auto *ret = dynamic_cast<const IShipyard *>(obj);
if(!ret ||
obj->tempOwner != currentPlayerID ||

14
lib/mapObjects/IMarket.cpp
View File

@@ -154,20 +154,6 @@ std::vector<TradeItemBuy> IMarket::availableItemsIds(EMarketMode mode) const
return ret;
}
const IMarket * IMarket::castFrom(const CGObjectInstance *obj, bool verbose)
{
auto * imarket = dynamic_cast<const IMarket *>(obj);
if(verbose && !imarket)
{
logGlobal->error("Cannot cast to IMarket");
if(obj)
{
logGlobal->error("Object type %s", obj->typeName);
}
}
return imarket;
}
IMarket::IMarket()
{
}

2
lib/mapObjects/IMarket.h
View File

@@ -29,8 +29,6 @@ public:
bool getOffer(int id1, int id2, int &val1, int &val2, EMarketMode mode) const; //val1 - how many units of id1 player has to give to receive val2 units
std::vector<EMarketMode> availableModes() const;
static const IMarket *castFrom(const CGObjectInstance *obj, bool verbose = true);
};
VCMI_LIB_NAMESPACE_END

5
lib/mapObjects/IObjectInterface.cpp
View File

@@ -156,9 +156,4 @@ void IShipyard::getBoatCost(TResources & cost) const
cost[EGameResID::GOLD] = 1000;
}
const IShipyard * IShipyard::castFrom( const CGObjectInstance *obj )
{
return dynamic_cast<const IShipyard *>(obj);
}
VCMI_LIB_NAMESPACE_END

2
lib/mapObjects/IObjectInterface.h
View File

@@ -101,8 +101,6 @@ class DLL_LINKAGE IShipyard : public IBoatGenerator
{
public:
virtual void getBoatCost(ResourceSet & cost) const;
static const IShipyard *castFrom(const CGObjectInstance *obj);
};
VCMI_LIB_NAMESPACE_END

2
server/CGameHandler.cpp
View File

@@ -3528,7 +3528,7 @@ void CGameHandler::objectVisitEnded(const CObjectVisitQuery & query)
bool CGameHandler::buildBoat(ObjectInstanceID objid, PlayerColor playerID)
{
const IShipyard *obj = IShipyard::castFrom(getObj(objid));
const auto *obj = dynamic_cast<const IShipyard *>(getObj(objid));
if (obj->shipyardStatus() != IBoatGenerator::GOOD)
{

2
server/NetPacksServer.cpp
View File

@@ -170,7 +170,7 @@ void ApplyGhNetPackVisitor::visitTradeOnMarketplace(TradeOnMarketplace & pack)
{
const CGObjectInstance * object = gh.getObj(pack.marketId);
const CGHeroInstance * hero = gh.getHero(pack.heroId);
const IMarket * market = IMarket::castFrom(object);
const auto * market = dynamic_cast<const IMarket*>(object);
gh.throwIfWrongPlayer(&pack);