From dc004c2a9d023ad39514b4eb822a863c717a067f Mon Sep 17 00:00:00 2001 From: hg <4683435+hgtw@users.noreply.github.com> Date: Sun, 1 May 2022 20:54:50 -0400 Subject: [PATCH] Remove already defined method (#2093) CastRestrictedSpell is already defined in common/spdat MSVC Debug builds caught this as an ODR violation, though Release builds still allowed it (maybe because the methods were identical) --- zone/gm_commands/findspell.cpp | 39 ---------------------------------- 1 file changed, 39 deletions(-) diff --git a/zone/gm_commands/findspell.cpp b/zone/gm_commands/findspell.cpp index b17febac4..78374a224 100755 --- a/zone/gm_commands/findspell.cpp +++ b/zone/gm_commands/findspell.cpp @@ -88,42 +88,3 @@ void command_findspell(Client *c, const Seperator *sep) } } } - -inline bool CastRestrictedSpell(int spellid) -{ - switch (spellid) { - case SPELL_TOUCH_OF_VINITRAS: - case SPELL_DESPERATE_HOPE: - case SPELL_CHARM: - case SPELL_METAMORPHOSIS65: - case SPELL_JT_BUFF: - case SPELL_CAN_O_WHOOP_ASS: - case SPELL_PHOENIX_CHARM: - case SPELL_CAZIC_TOUCH: - case SPELL_AVATAR_KNOCKBACK: - case SPELL_SHAPECHANGE65: - case SPELL_SUNSET_HOME1218: - case SPELL_SUNSET_HOME819: - case SPELL_SHAPECHANGE75: - case SPELL_SHAPECHANGE80: - case SPELL_SHAPECHANGE85: - case SPELL_SHAPECHANGE90: - case SPELL_SHAPECHANGE95: - case SPELL_SHAPECHANGE100: - case SPELL_SHAPECHANGE25: - case SPELL_SHAPECHANGE30: - case SPELL_SHAPECHANGE35: - case SPELL_SHAPECHANGE40: - case SPELL_SHAPECHANGE45: - case SPELL_SHAPECHANGE50: - case SPELL_NPC_AEGOLISM: - case SPELL_SHAPECHANGE55: - case SPELL_SHAPECHANGE60: - case SPELL_COMMAND_OF_DRUZZIL: - case SPELL_SHAPECHANGE70: - return true; - default: - return false; - } -} -