1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-07 23:33:15 +02:00

Integrated defaultMods into mod system

This commit is contained in:
Ivan Savenko
2023-03-15 21:34:29 +02:00
parent 2353137c74
commit 383387ef29
67 changed files with 508 additions and 365 deletions

View File

@@ -29,6 +29,7 @@
#include "CPlayerState.h"
#include "TerrainHandler.h"
#include "mapping/CCampaignHandler.h"
#include "GameSettings.h"
VCMI_LIB_NAMESPACE_BEGIN
@@ -1675,7 +1676,7 @@ void RebalanceStacks::applyGs(CGameState * gs)
const CCreature * srcType = src.army->getCreature(src.slot);
TQuantity srcCount = src.army->getStackCount(src.slot);
bool stackExp = VLC->modh->modules.STACK_EXP;
bool stackExp = VLC->settings()->getBoolean(EGameSettings::MODULE_STACK_EXPERIENCE);
if(srcCount == count) //moving whole stack
{
@@ -2201,7 +2202,7 @@ void BattleResult::applyGs(CGameState *gs)
}
}
if(VLC->modh->modules.STACK_EXP)
if(VLC->settings()->getBoolean(EGameSettings::MODULE_STACK_EXPERIENCE))
{
for(int i = 0; i < 2; i++)
if(exp[i])