Permalink
Browse files

Revert make_pair change, Didn't mean to submit that for PR; Also incl…

…uded a pair of parenthesis forgotten when checking for invalid class in transmog
  • Loading branch information...
1 parent b1cfecf commit 511fda50cc90df9f56d1ab1f738effed1b73b6b6 @Kretol Kretol committed Jan 6, 2013
@@ -0,0 +1,11 @@
+DELETE FROM `arkcore_string` WHERE `entry` IN (11003, 11004, 11007, 11008, 11009, 11010, 11011, 11012, 11013);
+INSERT INTO `arkcore_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(11003, 'Put your items in slot 1 and 2 in your bag!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11004, 'Not enough money! (Cost: %ug)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11007, 'Your item was not found!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11008, 'The items are for different slots!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11009, 'Your item is of an invalid type!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11010, 'Put the item in the first slot of your bag!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11011, 'The item is of an invalid quality!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11012, 'Item is for a different class!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(11013, 'Item is for a different race!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -186,7 +186,7 @@ void PetAI::UpdateAI(const uint32 diff)
// Fix to allow pets on STAY to autocast
if (me->getVictim() && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
{
- targetSpellStore.push_back(std::make_pair(me->getVictim(), spell));
+ targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(me->getVictim(), spell));
continue;
}
else
@@ -202,7 +202,7 @@ void PetAI::UpdateAI(const uint32 diff)
if (spell->CanAutoCast(Target))
{
- targetSpellStore.push_back(std::make_pair(Target, spell));
+ targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(Target, spell));
spellUsed = true;
break;
}
@@ -1390,7 +1390,7 @@ FakeResult Item::SetFakeDisplay(uint32 iEntry)
return FAKE_ERR_DIFF_INVENTORYTYPE;
// Valid classes are weapons and armor
- if ((myTmpl->Class != 2) && (myTmpl->Class != 4) || (otherTmpl->Class != 2) && (otherTmpl->Class != 4))
+ if (((myTmpl->Class != 2) && (myTmpl->Class != 4)) || ((otherTmpl->Class != 2) && (otherTmpl->Class != 4)))
return FAKE_ERR_INVALID_CLASS;
// Subclasses should match (eg, no axe->mace)

0 comments on commit 511fda5

Please sign in to comment.