Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-09 20:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

added new pet bitflag system

Browse Source
This commit is contained in:
jadebenn
2023-12-15 05:34:38 -06:00
parent 668bebf68c
commit 054371dd01
6 changed files with 82 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dGame/dComponents/PetComponent.cpp
View File

@@ -103,10 +103,13 @@ PetComponent::PetComponent(Entity* parent, uint32_t componentId): Component(pare
SetPreconditions(checkPreconditions);
}
// Get pet information from the CDClient
//LoadDataFromTemplate(); // TODO: Figure out how to load this with the tests (DarkflameServer/dDatabase/CDClientDatabase/CDClientTables/)
}
void PetComponent::LoadDataFromTemplate() {
auto query = CDClientDatabase::CreatePreppedStmt(
"SELECT walkSpeed, runSpeed, sprintSpeed, imaginationDrainRate FROM PetComponent WHERE id = ?;");
query.bind(1, static_cast<int>(componentId));
query.bind(1, static_cast<int>(m_ComponentId));
auto result = query.execQuery();
@@ -116,8 +119,6 @@ PetComponent::PetComponent(Entity* parent, uint32_t componentId): Component(pare
m_SprintSpeed = result.getFloatField(2, 10.0f);
imaginationDrainRate = result.getFloatField(3, 60.0f);
}
result.finalize();
}
void PetComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
@@ -1053,7 +1054,7 @@ void PetComponent::Activate(Item* item, bool registerPet, bool fromTaming) { //
auto* owner = GetOwner();
if (owner == nullptr) return;
SetStatus(1 << PetFlag::PLAY_SPAWN_ANIM);
SetStatus(1 << PetFlag::SPAWNING);
auto databaseData = inventoryComponent->GetDatabasePet(m_DatabaseId);

48
dGame/dComponents/PetComponent.h
View File

@@ -36,7 +36,7 @@ enum PetFlag : uint32_t {
NONE,
BEING_TAMED = 4,
NOT_WAITING = 5,
PLAY_SPAWN_ANIM = 7,
SPAWNING = 7,
TAMEABLE = 8
};
@@ -68,6 +68,16 @@ public:
PetComponent(Entity* parentEntity, uint32_t componentId);
~PetComponent() override;
/**
* Loads pet data from CDClient
*/
void LoadDataFromTemplate(); //TODO: Move
/**
* Serializes the pet
* @param outBitStream The output bitstream
* @param bIsInitialUpdate Boolean value of whether this is the initial update
*/
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
/**
@@ -82,23 +92,35 @@ public:
PetAiState GetPetAiState() { return m_State; };
/**
* Template function for setting pet flags
* Sets one or more pet flags
*/
template <typename... T>
void SetFlag(T... flag) {
//m_Flags |= (uint32_t)flag;
m_Flags |= ((uint32_t)flag | ...);//(static_cast<uint32_t>(flag) | ...);
//T::operator|(m_Flags, flag...);
template <typename... varArg>
void SetFlag(varArg... flag) {
const auto initFlags = m_Flags;
m_Flags |= (static_cast<uint32_t>(1 << flag) | ...);
LOG_DEBUG("SetFlag: %d + %d = %d", initFlags, 1 << (flag | ...), m_Flags);
}
/**
* Template function for getting pet flags
* Unsets one or more pet flags
*/
template <typename... T>
const bool HasFlag(T... flag) {
//return (m_Flags & (u_int32_t)flag) == (u_int32_t)flag;
//return T::operator&(m_Flags, flag...) == T::operator&(flag...);
return true;
template <typename... varArg>
void UnsetFlag(varArg... flag) {
const auto initFlags = m_Flags;
m_Flags &= ~(static_cast<uint32_t>(1 << flag) | ...);
LOG_DEBUG("UnsetFlag: %d - %d = %d", initFlags, 1 << (flag | ...), m_Flags);
} // THIS IS PROBLEMATIC
/**
* Gets one or more pet flags
*/
template <typename... varArg>
const bool HasFlag(varArg... flag) {
const auto lside = (m_Flags & (static_cast<uint32_t>(1 << flag) | ...));
const auto rside = (static_cast<uint32_t>(1 << flag) | ...);
LOG_DEBUG("HasFlag: %d == %d", lside, rside);
return lside == rside;
//return (m_Flags & (static_cast<uint32_t>(flag) | ...)) == (static_cast<uint32_t>(flag) | ...);
}
void Update(float deltaTime) override;