games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

vcmi: rename HeroBonus.h to Bonus.h

Browse Source
This commit is contained in:
Konstantin
2023-05-01 20:29:53 +03:00
committed by Konstantin P
parent 3df5a8e415
commit a6de9097be
66 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -849,12 +849,12 @@ CStackBasicDescriptor CGHeroInstance::calculateNecromancy (const BattleResult &b
}
}
// calculate number of creatures raised - low level units contribute at 50% rate
const double raisedUnitHealth = VLC->creh->objects[creatureTypeRaised]->MaxHealth();
const double raisedUnitHealth = VLC->creh->objects[creatureTypeRaised]->getMaxHealth();
double raisedUnits = 0;
for(const auto & casualty : casualties)
{
const CCreature * c = VLC->creh->objects[casualty.first];
double raisedFromCasualty = std::min(c->MaxHealth() / raisedUnitHealth, 1.0) * casualty.second * necromancySkill;
double raisedFromCasualty = std::min(c->getMaxHealth() / raisedUnitHealth, 1.0) * casualty.second * necromancySkill;
if(c->getLevel() < requiredCasualtyLevel)
raisedFromCasualty *= 0.5;
raisedUnits += raisedFromCasualty;

2
lib/mapObjects/CGTownInstance.cpp
View File

@@ -12,7 +12,7 @@
#include "CGTownInstance.h"
#include "CObjectClassesHandler.h"
#include "../spells/CSpellHandler.h"
#include "../bonuses/HeroBonus.h"
#include "../bonuses/Bonus.h"
#include "../battle/IBattleInfoCallback.h"
#include "../NetPacks.h"
#include "../CConfigHandler.h"

2
lib/mapObjects/CObjectHandler.h
View File

@@ -15,7 +15,7 @@
#include "../NetPacksBase.h"
#include "../ResourceSet.h"
#include "../bonuses/HeroBonus.h"
#include "../bonuses/Bonus.h"
VCMI_LIB_NAMESPACE_BEGIN

2
lib/mapObjects/MiscObjects.cpp
View File

@@ -1895,7 +1895,7 @@ void CGSirens::onHeroVisit( const CGHeroInstance * h ) const
if(drown)
{
cb->changeStackCount(StackLocation(h, i->first), -drown);
xp += drown * i->second->type->MaxHealth();
xp += drown * i->second->type->getMaxHealth();
}
}