clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family S3: remove ShortcutCooldowns (17 reinterpret_cast<ShortcutCooldowns&>(g_session.m_request

Browse source 
Batch #10274 by ragnarok-clanker: forced by an admin (3 lower score(s), 9 changed function(s)); checked with 348 compiled unit(s), including every includer of Source/Client/Mode/CGameMode.h, Source/Client/Session.h, Source/UI/Shortcuts/ShortcutCooldowns.h.
This commit is contained in:
ragnarok-clanker 2026-11-03 15:12:40 +00:00
commit 514c8dc0cd
12 changed files with 96 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Client/Mode/GameModeHandlers.cpp
View file

@ -2600,26 +2600,26 @@ void CGameMode::ReceiveSimulationResult(const unsigned char* packet) {
// OFFSET: 0x00D415C0
// FUNCTION: fn_21825
void CGameMode::UpdateSkillCooldown(std::uint16_t skill, std::uint32_t remaining, std::uint32_t duration) {
SessionRequestTimer value;
value.requestId = skill;
ShortcutCooldownRecord value;
value.id = skill;
const std::uint32_t now = g_replayAnimationScaling == 1 ? Replay::Instance().elapsed : timeGetTime();
value.readyTime = now + remaining;
value.end = now + remaining;
value.duration = duration;
for (const ShortcutCooldownIcon& icon : g_session.m_mainCooldownIcons) {
if (icon.id == skill) {
value.main.push_back(CooldownState(icon.slot, icon.x, icon.y, duration, value.readyTime - remaining, duration - remaining, 0));
value.main.push_back(CooldownState(icon.slot, icon.x, icon.y, duration, value.end - remaining, duration - remaining, 0));
}
}
for (const ShortcutCooldownIcon& icon : g_session.m_alternateCooldownIcons) {
if (icon.id == skill) {
value.alternate.push_back(CooldownState(icon.slot, icon.x, icon.y, duration, value.readyTime - remaining, duration - remaining, 0));
value.alternate.push_back(CooldownState(icon.slot, icon.x, icon.y, duration, value.end - remaining, duration - remaining, 0));
}
}
const auto found = std::find_if(g_session.m_requestTimers.begin(), g_session.m_requestTimers.end(), [skill](const SessionRequestTimer& timer) {
return timer.requestId == skill;
const auto found = std::find_if(g_session.m_requestTimers.begin(), g_session.m_requestTimers.end(), [skill](const ShortcutCooldownRecord& timer) {
return timer.id == skill;
});
if (found == g_session.m_requestTimers.end()) {
g_session.m_requestTimers.push_back(value);