diff --git a/WoW/Source/Client_CVar.cpp b/WoW/Source/Client_CVar.cpp index 5275e7e..f7f0319 100644 --- a/WoW/Source/Client_CVar.cpp +++ b/WoW/Source/Client_CVar.cpp @@ -373,9 +373,10 @@ static bool GammaCallback(CVar* var, const char* oldValue, const char* value, vo return true; } -// VERIFY: a49376e4 manual +// VERIFY: 134f8295 manual // OFFSET: 0x00401A80 static bool DesktopGammaCallback(CVar* var, const char* oldValue, const char* value, void* arg) { + // WoWFix335 windowed-mode-gamma-fix: desktopGamma ignored, original applies the desktop ramp when set SStrToInt(value); float gamma = s_gammaCvar ? s_gammaCvar->m_floatValue : 1.0f; diff --git a/WoW/Source/Object/ObjectClient/Player_C.cpp b/WoW/Source/Object/ObjectClient/Player_C.cpp index 23b2af7..cb815c2 100644 --- a/WoW/Source/Object/ObjectClient/Player_C.cpp +++ b/WoW/Source/Object/ObjectClient/Player_C.cpp @@ -8251,7 +8251,7 @@ void CGPlayer_C::ToggleSheathe() { } } -// VERIFY: 46257142 manual +// VERIFY: b949cd28 manual // OFFSET: 0x006E2610 void CGPlayer_C::MeleeModeEnter(const WOWGUID& target) { if (!CGGameUI::CanPerformAction(1)) { @@ -8325,6 +8325,7 @@ void CGPlayer_C::MeleeModeEnter(const WOWGUID& target) { this->SpellInterrupted(this->m_castCount, this->m_castSpellId); Spell_C_CancelAutoRepeat(true); Spell_C_ClearLastAutoRangedCombatError(); + // WoWFix335 melee-swing-right-click: original ends with UpdateBaseAnimation(0x40, -1) } // VERIFY: d5f87a32 manual diff --git a/WoW/Source/Object/ObjectClient/Unit_C.cpp b/WoW/Source/Object/ObjectClient/Unit_C.cpp index 219926c..22d7e46 100644 --- a/WoW/Source/Object/ObjectClient/Unit_C.cpp +++ b/WoW/Source/Object/ObjectClient/Unit_C.cpp @@ -1394,7 +1394,7 @@ void CGUnit_C::ModelLoaded(CM2Model* model) { } } -// VERIFY: 82112df4 manual +// VERIFY: 05c3070e manual // OFFSET: 0x0073DAB0 void CGUnit_C::PreAnimate(CGWorldFrame* frame) { uint32_t time = FrameTime::s_curTimeMs; @@ -1602,6 +1602,7 @@ void CGUnit_C::PreAnimate(CGWorldFrame* frame) { wanted = 0; } + // WoWFix335 npc-turn-attack-anim: original calls UpdateBaseAnimation(0, -1) when Unk71DE90() is nonzero if (sequence != wanted) { this->Unk71DE90(); } @@ -17889,7 +17890,7 @@ void CGUnit_C::SetUIChannelSpell(int32_t spellId, int32_t duration) { this->UpdateSpellCastBars(FrameTime::s_curTimeMs); } -// VERIFY: 117c6766 manual +// VERIFY: 4a2466af manual // OFFSET: 0x0073EB50 void CGUnit_C::OnChannelSpellChanged(int32_t oldSpell) { if (oldSpell) { @@ -17939,6 +17940,8 @@ void CGUnit_C::OnChannelSpellChanged(int32_t oldSpell) { this->m_fishingLineEffect->Release(); this->m_fishingLineEffect = nullptr; } + + // WoWFix335 missing-pre-cast-animation: original ends with UpdateBaseAnimation(0, -1) } // VERIFY: 49638f19 manual diff --git a/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp b/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp index eaef672..4d5e8be 100644 --- a/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp +++ b/WoW/Source/Ui/TradeSkillFrame_Scripts.cpp @@ -1034,7 +1034,7 @@ static int32_t Script_GetTradeSkillReagentInfo(lua_State* L) { return 4; } -// VERIFY: d4ae0022 auto +// VERIFY: db33e997 manual // OFFSET: 0x005DE620 static int32_t Script_GetTradeSkillTools(lua_State* L) { if (!lua_isnumber(L, 1)) { @@ -1110,7 +1110,7 @@ static int32_t Script_GetTradeSkillTools(lua_State* L) { lua_checkstack(L, 2); lua_pushstring(L, category->m_name); - if (player->m_bag.FindTotemCategory(spell.m_requiredTotemCategoryID[i], 0xFFFFFFEB)) { + if (player->m_bag.FindTotemCategory(spell.m_requiredTotemCategoryID[i], 0)) { lua_pushnumber(L, 1.0); } else { lua_pushnil(L);