Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-01-11 23:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

partially address comments

Browse Source
This commit is contained in:
jadebenn 2024-12-14 19:52:03 -06:00
parent 96f224c38c
commit 0786986345
5 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dCommon/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(DCOMMON_SOURCES
"BinaryIO.cpp" "BinaryIO.cpp"
"dConfig.cpp" "dConfig.cpp"
"Diagnostics.cpp" "Diagnostics.cpp"
"Flag.h"
"Logger.cpp" "Logger.cpp"
"Game.cpp" "Game.cpp"
"GeneralUtils.cpp" "GeneralUtils.cpp"

1
dCommon/Flag.h
View File

@ -1,3 +1,4 @@
#pragma once
#include "GeneralUtils.h" #include "GeneralUtils.h"
/** /**

2
dGame/dComponents/PetComponent.h
View File

@ -6,7 +6,7 @@
#include "MovementAIComponent.h" #include "MovementAIComponent.h"
#include "Component.h" #include "Component.h"
#include "Preconditions.h" #include "Preconditions.h"
#include "ePetAbilityType.h" #include "eHelpType.h"
#include "eReplicaComponentType.h" #include "eReplicaComponentType.h"
#include "ePetAbilityType.h" #include "ePetAbilityType.h"
#include "CDPetComponentTable.h" #include "CDPetComponentTable.h"

2
dGame/dComponents/SwitchComponent.cpp
View File

@ -79,8 +79,6 @@ void SwitchComponent::EntityEnter(Entity* entity) {
if (m_PetBouncer != nullptr) { if (m_PetBouncer != nullptr) {
GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 2602, u"pettriggeractive", "BounceEffect", LWOOBJID_EMPTY, 1, 1, true); GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 2602, u"pettriggeractive", "BounceEffect", LWOOBJID_EMPTY, 1, 1, true);
//RenderComponent::PlayAnimation(m_Parent, u"engaged");
//m_PetBouncer->SetPetBouncerEnabled(true);
} else { } else {
Game::entityManager->SerializeEntity(m_Parent); Game::entityManager->SerializeEntity(m_Parent);
} }

3
dGame/dGameMessages/GameMessages.h
View File

@ -10,8 +10,6 @@
#include "eEndBehavior.h" #include "eEndBehavior.h"
#include "eCyclingMode.h" #include "eCyclingMode.h"
#include "eLootSourceType.h" #include "eLootSourceType.h"
#include "eHelpType.h"
#include "ePetAbilityType.h"
#include "Brick.h" #include "Brick.h"
class AMFBaseValue; class AMFBaseValue;
@ -28,6 +26,7 @@ enum class eAnimationFlags : uint32_t;
enum class eUnequippableActiveType; enum class eUnequippableActiveType;
enum eInventoryType : uint32_t; enum eInventoryType : uint32_t;
enum class eGameMasterLevel : uint8_t; enum class eGameMasterLevel : uint8_t;
enum class eHelpType : int32_t;
enum class eMatchUpdate : int32_t; enum class eMatchUpdate : int32_t;
enum class eKillType : uint32_t; enum class eKillType : uint32_t;
enum class eObjectWorldState : uint32_t; enum class eObjectWorldState : uint32_t;