Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-25 23:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up kruft

Browse Source
This commit is contained in:
jadebenn 2023-11-18 18:50:09 -06:00
parent 5734ef85e8
commit a76ddd9ae1
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dGame/dComponents/BouncerComponent.cpp
View File

@ -25,8 +25,7 @@ BouncerComponent::~BouncerComponent() {
void BouncerComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) { void BouncerComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
outBitStream->Write(m_PetEnabled); outBitStream->Write(m_PetEnabled);
if (m_PetEnabled) { if (m_PetEnabled) {
LOG("NOPE."); outBitStream->Write(m_PetBouncerEnabled);
//outBitStream->Write(m_PetBouncerEnabled);
} }
} }

13
dGame/dComponents/SwitchComponent.cpp
View File

@ -101,15 +101,6 @@ void SwitchComponent::Update(float deltaTime) {
} }
} }
void SwitchComponent::OnUse(Entity* originator) {
LOG("YOU USED ME!");
m_Parent->TriggerEvent(eTriggerEventType::INTERACT, originator);
for (CppScripts::Script* script : CppScripts::GetEntityScripts(m_Parent)) {
script->OnUse(m_Parent, originator);
}
}
Entity* SwitchComponent::GetParentEntity() const { Entity* SwitchComponent::GetParentEntity() const {
return m_Parent; return m_Parent;
} }
@ -135,8 +126,8 @@ void SwitchComponent::SetPetBouncer(BouncerComponent* value) {
m_PetBouncer = value; m_PetBouncer = value;
if (value != nullptr) { if (value != nullptr) {
//m_PetBouncer->SetPetEnabled(true); m_PetBouncer->SetPetEnabled(true);
//petSwitches.push_back(this); //This seems to govern if pets can "see" this petSwitches.push_back(this);
} }
} }

2
dGame/dComponents/SwitchComponent.h
View File

@ -23,8 +23,6 @@ public:
void Update(float deltaTime) override; void Update(float deltaTime) override;
void OnUse(Entity* originator) override;
Entity* GetParentEntity() const; Entity* GetParentEntity() const;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override; void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;