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

Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359

Browse Source
This commit is contained in:
AlexVinS
2016-11-24 20:34:37 +03:00
parent b880e2b586
commit db40e125eb
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CPreGame.cpp
View File

@@ -1309,7 +1309,7 @@ SelectionTab::SelectionTab(CMenuScreen::EState Type, const std::function<void(CM
selectFName("Maps/Arrogance"); selectFName("Maps/Arrogance");
else else
selectFName(settings["session"]["lastMap"].String()); selectFName(settings["session"]["lastMap"].String());
break; break;
case CMenuScreen::campaignList: case CMenuScreen::campaignList:
select(0); select(0);

1
client/widgets/Buttons.cpp
View File

@@ -41,6 +41,7 @@ void ClickableArea::addCallback(std::function<void()> callback)
void ClickableArea::setArea(CIntObject * object) void ClickableArea::setArea(CIntObject * object)
{ {
delete area; delete area;
area = object;
addChild(area); addChild(area);
pos.w = object->pos.w; pos.w = object->pos.w;
pos.h = object->pos.h; pos.h = object->pos.h;

12
lib/BattleState.cpp
View File

@@ -102,14 +102,12 @@ ui32 BattleInfo::calculateDmg( const CStack* attacker, const CStack* defender,
if(range.first != range.second) if(range.first != range.second)
{ {
int valuesToAverage[10]; ui32 sum = 0;
int howManyToAv = std::min<ui32>(10, attacker->count); ui32 howManyToAv = std::min<ui32>(10, attacker->count);
for (int g=0; g<howManyToAv; ++g) for(int g=0; g<howManyToAv; ++g)
{ sum += (ui32)rand.nextInt(range.first, range.second);
valuesToAverage[g] = rand.nextInt(range.first, range.second);
}
return std::accumulate(valuesToAverage, valuesToAverage + howManyToAv, 0) / howManyToAv; return sum / howManyToAv;
} }
else else
return range.first; return range.first;

11
lib/CCreatureHandler.cpp
View File

@@ -46,10 +46,13 @@ int CCreature::estimateCreatureCount(ui32 countID)
{ {
static const int creature_count[] = { 0, 3, 8, 15, 35, 75, 175, 375, 750, 2500 }; static const int creature_count[] = { 0, 3, 8, 15, 35, 75, 175, 375, 750, 2500 };
if (countID > 9) if(countID > 9)
assert("Wrong countID!"); {
logGlobal->error("Wrong countID %d!", countID);
return creature_count[countID]; return 0;
}
else
return creature_count[countID];
} }
bool CCreature::isDoubleWide() const bool CCreature::isDoubleWide() const

2
lib/rmg/CRmgTemplateStorage.cpp
View File

@@ -251,7 +251,7 @@ CRmgTemplate::CSize CRmgTemplateStorage::parseMapTemplateSize(const std::string
if(it == mapSizeMapping.end()) if(it == mapSizeMapping.end())
{ {
// Map size is given as a number representation // Map size is given as a number representation
const auto & numericalRep = parts[0]; const std::string numericalRep = parts[0];
parts.clear(); parts.clear();
boost::split(parts, numericalRep, boost::is_any_of("x")); boost::split(parts, numericalRep, boost::is_any_of("x"));
assert(parts.size() == 3); assert(parts.size() == 3);

2
lib/rmg/CRmgTemplateZone.cpp
View File

@@ -2374,8 +2374,6 @@ ObjectInfo CRmgTemplateZone::getRandomObject(CMapGenerator* gen, CTreasurePileIn
}); });
return *(it->second); return *(it->second);
} }
return ObjectInfo(); // unreachable
} }
void CRmgTemplateZone::addAllPossibleObjects(CMapGenerator* gen) void CRmgTemplateZone::addAllPossibleObjects(CMapGenerator* gen)