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

went through the rest of cppcheck warnings, mostly harmless

Browse Source
This commit is contained in:
Ivan Savenko
2013-11-07 12:48:41 +00:00
parent 71d6b0fea9
commit ee6cdbeffe
39 changed files with 88 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CObjectHandler.cpp
View File

@ -2311,6 +2311,7 @@ void CGTownInstance::initObj()
break;
case 5:
bonusingBuildings.push_back (new COPWBonus(BuildingID::MANA_VORTEX, this));
//fallthrough
case 2: case 3: case 6:
bonusingBuildings.push_back (new CTownBonus(BuildingID::SPECIAL_4, this));
break;
@ -3524,12 +3525,11 @@ void CGCreature::fight( const CGHeroInstance *h ) const
{
stacksCount = 3;
}
int stackSize;
SlotID sourceSlot = stacks.begin()->first;
SlotID destSlot;
for (int stacksLeft = stacksCount; stacksLeft > 1; --stacksLeft)
{
stackSize = stacks.begin()->second->count / stacksLeft;
int stackSize = stacks.begin()->second->count / stacksLeft;
if (stackSize)
{
if ((destSlot = getFreeSlot()).validSlot())
@ -6066,7 +6066,6 @@ void CGOnceVisitable::onHeroVisit( const CGHeroInstance * h ) const
cb->showBlockingDialog(&bd);
return;
}
break;
default:
logGlobal->errorStream() << "Error: Unknown object (" << ID <<") treated as CGOnceVisitable!";
return;
@ -7197,7 +7196,6 @@ void CArmedInstance::randomizeArmy(int type)
int level = (randID-VLC->creh->creatures.size()) / 2 -1;
bool upgrade = !(randID % 2);
elem.second->setType(VLC->townh->factions[type]->town->creatures[level][upgrade]);
randID = -1;
}
assert(elem.second->armyObj == this);
@ -7431,8 +7429,6 @@ std::vector<int> IMarket::availableItemsIds(EMarketMode::EMarketMode mode) const
case EMarketMode::CREATURE_RESOURCE:
for (int i = 0; i < 7; i++)
ret.push_back(i);
default:
break;
}
return ret;
}