Minor correction to merge

This commit is contained in:
Spp
2013-05-21 11:46:52 +02:00
parent ec0688ade3
commit 6c5529a5a0
2 changed files with 2 additions and 2 deletions

View File

@@ -68,7 +68,7 @@ char const GtChanceToMeleeCritBasefmt[] = "xf";
char const GtChanceToMeleeCritfmt[] = "xf";
char const GtChanceToSpellCritBasefmt[] = "xf";
char const GtChanceToSpellCritfmt[] = "xf";
char const GtNPCManaCostScalerfmt[] = "f";
char const GtNPCManaCostScalerfmt[] = "xf";
char const GtOCTClassCombatRatingScalarfmt[] = "df";
char const GtOCTRegenHPfmt[] = "f";
//char const GtOCTRegenMPfmt[] = "f";

View File

@@ -1093,7 +1093,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
if (pCurrChar->getClass() == CLASS_HUNTER)
{
static uint32 const HunterCreatePetSpells[MAX_RACES] =
static uint32 const HunterCreatePetSpells[MAX_RACES] =
{
0, /* None */ 79597, /* Human - Young Wolf */
79598, /* Orc - Young Boar */ 79593, /* Dwarf - Young Bear */