diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-12-30 18:44:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-12-30 19:51:36 +0100 |
| commit | bd21917ad6b4154a24d4d6aecf7a24e872e11047 (patch) | |
| tree | 059fa447527cec9c19d0c470a6c0651d4ef1d020 /src | |
| parent | 261944da4d07bc4ab60e3785559d4c4593005f07 (diff) | |
Core/PacketIO: Fixed naming for SMSG_TRAINER_LIST profession related fields
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Trainer.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/NPCPackets.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/NPCPackets.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/server/game/Entities/Creature/Trainer.cpp b/src/server/game/Entities/Creature/Trainer.cpp index 79e496ce3bc..24bf32bbdda 100644 --- a/src/server/game/Entities/Creature/Trainer.cpp +++ b/src/server/game/Entities/Creature/Trainer.cpp @@ -61,8 +61,8 @@ namespace Trainer trainerListSpell.SpellID = trainerSpell.SpellId; trainerListSpell.Usable = AsUnderlyingType(GetSpellState(player, &trainerSpell)); trainerListSpell.MoneyCost = int32(trainerSpell.MoneyCost * reputationDiscount); - trainerListSpell.ProfessionDialog = (primaryProfessionFirstRank && (player->GetFreePrimaryProfessionPoints() > 0) ? 1 : 0); - trainerListSpell.ProfessionButton = (primaryProfessionFirstRank ? 1 : 0); + trainerListSpell.PointCost[0] = 0; // spells don't cost talent points + trainerListSpell.PointCost[1] = (primaryProfessionFirstRank ? 1 : 0); trainerListSpell.ReqLevel = trainerSpell.ReqLevel; trainerListSpell.ReqSkillLine = trainerSpell.ReqSkillLine; trainerListSpell.ReqSkillRank = trainerSpell.ReqSkillRank; diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp index bef58fabd02..fb57975a97a 100644 --- a/src/server/game/Server/Packets/NPCPackets.cpp +++ b/src/server/game/Server/Packets/NPCPackets.cpp @@ -33,8 +33,7 @@ WorldPacket const* WorldPackets::NPC::TrainerList::Write() _worldPacket << int32(spell.SpellID); _worldPacket << uint8(spell.Usable); _worldPacket << int32(spell.MoneyCost); - _worldPacket << int32(spell.ProfessionDialog); - _worldPacket << int32(spell.ProfessionButton); + _worldPacket.append(spell.PointCost.data(), spell.PointCost.size()); _worldPacket << uint8(spell.ReqLevel); _worldPacket << int32(spell.ReqSkillLine); _worldPacket << int32(spell.ReqSkillRank); diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index cdbf7072a8a..7bac1c129c1 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -47,8 +47,7 @@ namespace WorldPackets int32 SpellID = 0; uint8 Usable = 0; int32 MoneyCost = 0; - int32 ProfessionDialog = 0; - int32 ProfessionButton = 0; + std::array<int32, 2> PointCost = { }; // compared with PLAYER_CHARACTER_POINTS in Lua uint8 ReqLevel = 0; int32 ReqSkillLine = 0; int32 ReqSkillRank = 0; |