nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-05 12:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Spells/SpellInfoCorrections.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
This commit is contained in:
bash
2025-12-07 12:04:32 +01:00
parent 08323af7a5 34f261b92c
commit 58c1c49610
146 changed files with 4869 additions and 2103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/Utilities/Util.h
View File

@@ -47,15 +47,6 @@ AC_COMMON_API Optional<int32> MoneyStringToMoney(std::string_view moneyString);
std::string secsToTimeString(uint64 timeInSecs, bool shortText = false);
uint32 TimeStringToSecs(const std::string& timestring);
inline void ApplyPercentModFloatVar(float& var, float val, bool apply)
{
if (val == -100.0f) // prevent set var to zero
{
val = -99.99f;
}
var *= (apply ? (100.0f + val) / 100.0f : 100.0f / (100.0f + val));
}
// Percentage calculation
template <class T, class U>
inline T CalculatePct(T base, U pct)