diff options
author | Spp <spp@jorge.gr> | 2013-05-21 11:46:52 +0200 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2013-05-21 11:46:52 +0200 |
commit | 6c5529a5a0d0eca02f7a26b0bf2009b63e02812b (patch) | |
tree | aeb9eaa4740622dca5244dfc17c5b0d686421a01 /src | |
parent | ec0688ade37677d43e22c05b7c480217b0528709 (diff) |
Minor correction to merge
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/DataStores/DBCfmt.h | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index cc10199c240..0870f2ad071 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -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"; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 3c2c44d2670..2242bc9483a 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -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 */ |