games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Seems to be actually a missing return and redundant check.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2012-05-29 23:22:28 +00:00
parent faaf799d95
commit 247fabc3a6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/BattleState.cpp
View File

@@ -3063,8 +3063,8 @@ const CGHeroInstance * CStack::getMyHero() const
return dynamic_cast<const CGHeroInstance *>(base->armyObj); return dynamic_cast<const CGHeroInstance *>(base->armyObj);
else //we are attached directly? else //we are attached directly?
BOOST_FOREACH(const CBonusSystemNode *n, getParentNodes()) BOOST_FOREACH(const CBonusSystemNode *n, getParentNodes())
if(n->getNodeType() == HERO) if(n->getNodeType() == HERO)
dynamic_cast<const CGHeroInstance *>(n);//FIXME: unused result. Missing return? return dynamic_cast<const CGHeroInstance *>(n);
return NULL; return NULL;
} }

1
server/CGameHandler.cpp
View File

@@ -1517,7 +1517,6 @@ void CGameHandler::run(bool resume)
for(; i != gs->players.end(); i++) for(; i != gs->players.end(); i++)
{ {
if((i->second.towns.size()==0 && i->second.heroes.size()==0) if((i->second.towns.size()==0 && i->second.heroes.size()==0)
//|| i->second.color<0 //FIXME: color is unsigned. Redundant or incorrect check?
|| i->first>=GameConstants::PLAYER_LIMIT || i->first>=GameConstants::PLAYER_LIMIT
|| i->second.status) || i->second.status)
{ {