aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Object/Object.cpp20
-rw-r--r--src/server/game/Entities/Player/Player.cpp17
-rw-r--r--src/server/game/Entities/Player/Player.h7
3 files changed, 21 insertions, 23 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index ac3625ca3f4..8572d23bf64 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -359,17 +359,17 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const
bool EnablePortals = false;
bool PlayHoverAnim = false;
bool IsSuppressingGreetings = false;
- bool HasMovementUpdate = flags & UPDATEFLAG_LIVING ? true : false;
- bool HasMovementTransport = flags & UPDATEFLAG_TRANSPORT_POSITION ? true : false;
- bool Stationary = flags & UPDATEFLAG_STATIONARY_POSITION ? true : false;
- bool CombatVictim = flags & UPDATEFLAG_HAS_TARGET ? true : false;
- bool ServerTime = flags & UPDATEFLAG_TRANSPORT ? true : false;
- bool VehicleCreate = flags & UPDATEFLAG_VEHICLE ? true : false;
- bool AnimKitCreate = flags & UPDATEFLAG_ANIMKITS ? true : false;
- bool Rotation = flags & UPDATEFLAG_ROTATION ? true : false;
+ bool HasMovementUpdate = (flags & UPDATEFLAG_LIVING) != 0;
+ bool HasMovementTransport = (flags & UPDATEFLAG_TRANSPORT_POSITION) != 0;
+ bool Stationary = (flags & UPDATEFLAG_STATIONARY_POSITION) != 0;
+ bool CombatVictim = (flags & UPDATEFLAG_HAS_TARGET) != 0;
+ bool ServerTime = (flags & UPDATEFLAG_TRANSPORT) != 0;
+ bool VehicleCreate = (flags & UPDATEFLAG_VEHICLE) != 0;
+ bool AnimKitCreate = (flags & UPDATEFLAG_ANIMKITS) != 0;
+ bool Rotation = (flags & UPDATEFLAG_ROTATION) != 0;
bool HasAreaTrigger = false;
bool HasGameObject = false;
- bool ThisIsYou = flags & UPDATEFLAG_SELF ? true : false;
+ bool ThisIsYou = (flags & UPDATEFLAG_SELF) != 0;
bool ReplaceActive = false;
bool SceneObjCreate = false;
bool ScenePendingInstances = false;
@@ -379,7 +379,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const
PauseTimesCount = go->GetGOValue()->Transport.StopFrames->size();
data->WriteBit(NoBirthAnim);
- data->WriteBit(EnablePortals);
+ data->WriteBit(EnablePortals);
data->WriteBit(PlayHoverAnim);
data->WriteBit(IsSuppressingGreetings);
data->WriteBit(HasMovementUpdate);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e45f7c896b9..be2563ea0ee 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -31,6 +31,7 @@
#include "Channel.h"
#include "ChannelMgr.h"
#include "CharacterDatabaseCleaner.h"
+#include "CharacterPackets.h"
#include "Chat.h"
#include "Common.h"
#include "ConditionMgr.h"
@@ -930,7 +931,7 @@ void Player::CleanupsBeforeDelete(bool finalCleanup)
itr->second.save->RemovePlayer(this);
}
-bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo)
+bool Player::Create(ObjectGuid::LowType guidlow, WorldPackets::Character::CharacterCreateInfo const* createInfo)
{
//FIXME: outfitId not used in player creating
/// @todo need more checks against packet modifications
@@ -970,14 +971,14 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
setFactionForRace(createInfo->Race);
- if (!IsValidGender(createInfo->Gender))
+ if (!IsValidGender(createInfo->Sex))
{
TC_LOG_ERROR("entities.player", "Player::Create: Possible hacking-attempt: Account %u tried creating a character named '%s' with an invalid gender (%u) - refusing to do so",
- GetSession()->GetAccountId(), m_name.c_str(), createInfo->Gender);
+ GetSession()->GetAccountId(), m_name.c_str(), createInfo->Sex);
return false;
}
- uint32 RaceClassGender = (createInfo->Race) | (createInfo->Class << 8) | (createInfo->Gender << 16);
+ uint32 RaceClassGender = (createInfo->Race) | (createInfo->Class << 8) | (createInfo->Sex << 16);
SetUInt32Value(UNIT_FIELD_BYTES_0, (RaceClassGender | (powertype << 24)));
InitDisplayIds();
@@ -993,11 +994,11 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
SetInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1)); // -1 is default value
SetUInt32Value(PLAYER_BYTES, (createInfo->Skin | (createInfo->Face << 8) | (createInfo->HairStyle << 16) | (createInfo->HairColor << 24)));
- SetUInt32Value(PLAYER_BYTES_2, (createInfo->FacialHair |
+ SetUInt32Value(PLAYER_BYTES_2, (createInfo->FacialHairStyle |
(0x00 << 8) |
(0x00 << 16) |
(((GetSession()->IsARecruiter() || GetSession()->GetRecruiterId() != 0) ? REST_STATE_RAF_LINKED : REST_STATE_NOT_RAF_LINKED) << 24)));
- SetByteValue(PLAYER_BYTES_3, 0, createInfo->Gender);
+ SetByteValue(PLAYER_BYTES_3, 0, createInfo->Sex);
SetByteValue(PLAYER_BYTES_3, 3, 0); // BattlefieldArenaFaction (0 or 1)
SetGuidValue(OBJECT_FIELD_DATA, ObjectGuid::Empty);
@@ -1121,7 +1122,7 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
addActionButton(action_itr->button, action_itr->action, action_itr->type);
// original items
- if (CharStartOutfitEntry const* oEntry = GetCharStartOutfitEntry(createInfo->Race, createInfo->Class, createInfo->Gender))
+ if (CharStartOutfitEntry const* oEntry = GetCharStartOutfitEntry(createInfo->Race, createInfo->Class, createInfo->Sex))
{
for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
{
@@ -20242,7 +20243,7 @@ void Player::SetUInt32ValueInArray(Tokenizer& Tokenizer, uint16 index, uint32 va
Tokenizer[index] = buf;
}
-void Player::Customize(CharacterCustomizeInfo const* customizeInfo, SQLTransaction& trans)
+void Player::Customize(WorldPackets::Character::CharacterCustomizeInfo const* customizeInfo, SQLTransaction& trans)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_PLAYERBYTES2);
stmt->setUInt64(0, customizeInfo->Guid.GetCounter());
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 74222bd162f..8509ec2bcf1 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -44,7 +44,6 @@ struct VendorItem;
template<class T> class AchievementMgr;
class ReputationMgr;
class Channel;
-class CharacterCreateInfo;
class Creature;
class DynamicObject;
class Group;
@@ -56,8 +55,6 @@ class PlayerSocial;
class SpellCastTargets;
class UpdateMask;
-struct CharacterCustomizeInfo;
-
typedef std::deque<Mail*> PlayerMails;
#define PLAYER_MAX_SKILLS 128
@@ -1289,7 +1286,7 @@ class Player : public Unit, public GridObject<Player>
void SetSummonPoint(uint32 mapid, float x, float y, float z);
void SummonIfPossible(bool agree);
- bool Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo);
+ bool Create(ObjectGuid::LowType guidlow, WorldPackets::Character::CharacterCreateInfo const* createInfo);
void Update(uint32 time) override;
@@ -1711,7 +1708,7 @@ class Player : public Unit, public GridObject<Player>
static void SetUInt32ValueInArray(Tokenizer& data, uint16 index, uint32 value);
static void SetFloatValueInArray(Tokenizer& data, uint16 index, float value);
- static void Customize(CharacterCustomizeInfo const* customizeInfo, SQLTransaction& trans);
+ static void Customize(WorldPackets::Character::CharacterCustomizeInfo const* customizeInfo, SQLTransaction& trans);
static void SavePositionInDB(WorldLocation const& loc, uint16 zoneId, ObjectGuid guid, SQLTransaction& trans);
static void DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRealmChars = true, bool deleteFinally = false);