Merge remote-tracking branch 'upstream/development' into repacker

coolzoom · Aug 6, 2024 · 8b4b2da · 8b4b2da
2 parents 3ae5280 + d910f62
commit 8b4b2da
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 112 deletions.
diff --git a/src/game/GuardMgr.cpp b/src/game/GuardMgr.cpp
@@ -156,7 +156,7 @@ enum GuardIds
     NPC_ARGENT_SENTRY           = 16378,
 };
 
-GuardMgr::GuardMgr()
+GuardMgr::GuardMgr() : m_uiRechargeTimer(GUARD_POST_RECHARGE_TIME)
 {
     // Area Id                                                       Alliance NPC                 Horde NPC
     m_mAreaGuardInfo.insert({ AREA_STORMWIND,          AreaGuardInfo(NPC_STORMWIND_CITY_GUARD,    NPC_NONE) });