mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 16:38:42 +01:00
*Fix build with GCC, thanks to Brian.
--HG-- branch : trunk rename : sql/updates/7234_world_spell_ranks.sql => sql/updates/7236_world_spell_ranks.sql
This commit is contained in:
@@ -1,3 +1,12 @@
|
||||
DROP TABLE IF EXISTS `spell_ranks`;
|
||||
CREATE TABLE `spell_ranks` (
|
||||
`first_spell_id` INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
`spell_id` INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
`rank` TINYINT UNSIGNED NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`first_spell_id`, `rank`),
|
||||
UNIQUE (`spell_id`)
|
||||
) ENGINE=MYISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell Rank Data';
|
||||
|
||||
INSERT INTO spell_ranks (`first_spell_id`, `spell_id`, `rank`) VALUES
|
||||
-- Abomination's Might
|
||||
(53137, 53137, 1),
|
||||
@@ -3256,7 +3256,7 @@ void SpellMgr::LoadSpellRanks()
|
||||
do
|
||||
{
|
||||
// spellid, rank
|
||||
std::list<std::pair<int32, int32>> rankChain;
|
||||
std::list < std::pair < int32, int32 > > rankChain;
|
||||
int32 currentSpell = -1;
|
||||
int32 lastSpell = -1;
|
||||
|
||||
@@ -3299,7 +3299,7 @@ void SpellMgr::LoadSpellRanks()
|
||||
int32 curRank = 0;
|
||||
bool valid = true;
|
||||
// check spells in chain
|
||||
for (std::list<std::pair<int32, int32>>::iterator itr = rankChain.begin() ; itr!= rankChain.end(); ++itr)
|
||||
for (std::list<std::pair<int32, int32> >::iterator itr = rankChain.begin() ; itr!= rankChain.end(); ++itr)
|
||||
{
|
||||
SpellEntry const * spell = sSpellStore.LookupEntry(itr->first);
|
||||
if (!spell)
|
||||
@@ -3320,7 +3320,7 @@ void SpellMgr::LoadSpellRanks()
|
||||
continue;
|
||||
int32 prevRank = 0;
|
||||
// insert the chain
|
||||
std::list<std::pair<int32, int32>>::iterator itr = rankChain.begin();
|
||||
std::list<std::pair<int32, int32> >::iterator itr = rankChain.begin();
|
||||
do
|
||||
{
|
||||
int32 addedSpell = itr->first;
|
||||
|
||||
Reference in New Issue
Block a user