C++ Another solution for the same problem

[roriscrave]

In this topic, they give some solution for spam spells problem:

C++ - TFS 1.2 Is it possible to fix the spell emote spam

I will try to explain what i mean but basically when you cast a spell orange text appears above your head right? So if you cast it like a lot of time it stacks up and it looks just nasty so i will provide image what i mean Is it possible to make it so it send only like max 3 not that much as in...

otland.net

but I didn't really like the solution adopted, because if the player uses "exori 'and then" exori hur", "exana morth" both spells will release, but the "exori hur" and "exana mort" will not appear in orange (because of delay), what makes game looked bugged.

is it possible a solution, when spam, show only 3 spells in orange? (3 last spells casted)?

 

[Sarah Wesker]

With the following changes, each spell has its own cooldown, only regarding the text obviously!

game.cpp

bool Game::playerSaySpell(Player* player, SpeakClasses type, const std::string& text)
{
    std::string words = text;

    TalkActionResult_t result = g_talkActions->playerSaySpell(player, type, words);
    if (result == TALKACTION_BREAK) {
        return true;
    }

    InstantSpell* instantSpell;
    result = g_spells->playerSaySpell(player, words, instantSpell);
    if (result == TALKACTION_BREAK) {
        if (instantSpell) {
            int64_t milliseconds = 0;
            const int8_t& spellId = instantSpell->getId();
            player->getStorageValue(spellId, milliseconds);
            int64_t now = OTSYS_TIME();
            if (milliseconds <= now) {
                player->setStorageValue(spellId, now + 3000);
            }
            else {
                // Dont show spell emote
                return true;
            }
        }
        if (!g_config.getBoolean(ConfigManager::EMOTE_SPELLS)) {
            return internalCreatureSay(player, TALKTYPE_SAY, words, false);
        } else {
            return internalCreatureSay(player, TALKTYPE_MONSTER_SAY, words, false);
        }

    } else if (result == TALKACTION_FAILED) {
        return true;
    }

    return false;
}

spells.cpp

// Found:
TalkActionResult_t Spells::playerSaySpell(Player* player, std::string& words)

// Replace:
TalkActionResult_t Spells::playerSaySpell(Player* player, std::string& words, InstantSpell*& instantSpell)

spells.h

// Found:
TalkActionResult_t playerSaySpell(Player* player, std::string& words);

// Replace:
TalkActionResult_t playerSaySpell(Player* player, std::string& words, InstantSpell*& spell);