Skip to content

chore: 105919: code improvements to clean up warnings #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FlufflesTheMicrosaur wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: 105919: code improvements to clean up warnings #314

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8b07b
chore: 105919: update to more modern syntax to suppress warning
FlufflesTheMicrosaur Jan 15, 2026
1bb126a
chore: 105919: further cleanup to remove missed redundant code (credi…
FlufflesTheMicrosaur Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Mammoth/TSE/CArmorClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,11 @@ void CArmorClass::CalcAdjustedDamage (CItemCtx &ItemCtx, SDamageCtx &Ctx)

iDamage = Ctx.CalcDamageMethodAdjDamage(iMethod, rFortificationAdj);
}
else
{
ASSERT(false);
iDamage = 0;
}

// Adjust for special armor damage:
//
Expand Down Expand Up @@ -1972,11 +1977,11 @@ void CArmorClass::GenerateScaledStats (void)
// Immunities based on level

Stats.iBlindingDamageAdj = Min(m_Stats.iBlindingDamageAdj, (Stats.iLevel >= BLIND_IMMUNE_LEVEL ? 0 : 100));
Stats.fRadiationImmune = m_Stats.fRadiationImmune || (Stats.iLevel >= RADIATION_IMMUNE_LEVEL ? true : false);
Stats.fRadiationImmune |= Stats.iLevel >= RADIATION_IMMUNE_LEVEL;
Stats.iEMPDamageAdj = Min(m_Stats.iEMPDamageAdj, (Stats.iLevel >= EMP_IMMUNE_LEVEL ? 0 : 100));
Stats.iDeviceDamageAdj = Min(m_Stats.iDeviceDamageAdj, (Stats.iLevel >= DEVICE_DAMAGE_IMMUNE_LEVEL ? 0 : 100));
Stats.fDisintegrationImmune = m_Stats.fDisintegrationImmune || (Stats.iLevel >= DISINTEGRATION_IMMUNE_LEVEL ? true : false);
Stats.fShatterImmune = m_Stats.fShatterImmune || (Stats.iLevel >= SHATTER_IMMUNE_LEVEL ? true : false);
Stats.fDisintegrationImmune |= Stats.iLevel >= DISINTEGRATION_IMMUNE_LEVEL;
Stats.fShatterImmune |= Stats.iLevel >= SHATTER_IMMUNE_LEVEL;

// Regen and decay

Expand Down