diff --git a/dGame/dComponents/BouncerComponent.cpp b/dGame/dComponents/BouncerComponent.cpp index 49f6757f..56002ac4 100644 --- a/dGame/dComponents/BouncerComponent.cpp +++ b/dGame/dComponents/BouncerComponent.cpp @@ -25,8 +25,7 @@ BouncerComponent::~BouncerComponent() { void BouncerComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) { outBitStream->Write(m_PetEnabled); if (m_PetEnabled) { - LOG("NOPE."); - //outBitStream->Write(m_PetBouncerEnabled); + outBitStream->Write(m_PetBouncerEnabled); } } diff --git a/dGame/dComponents/SwitchComponent.cpp b/dGame/dComponents/SwitchComponent.cpp index 9d8cd7bc..41dff9f5 100644 --- a/dGame/dComponents/SwitchComponent.cpp +++ b/dGame/dComponents/SwitchComponent.cpp @@ -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 { return m_Parent; } @@ -135,8 +126,8 @@ void SwitchComponent::SetPetBouncer(BouncerComponent* value) { m_PetBouncer = value; if (value != nullptr) { - //m_PetBouncer->SetPetEnabled(true); - //petSwitches.push_back(this); //This seems to govern if pets can "see" this + m_PetBouncer->SetPetEnabled(true); + petSwitches.push_back(this); } } diff --git a/dGame/dComponents/SwitchComponent.h b/dGame/dComponents/SwitchComponent.h index f27dc7b0..25f694ba 100644 --- a/dGame/dComponents/SwitchComponent.h +++ b/dGame/dComponents/SwitchComponent.h @@ -23,8 +23,6 @@ public: void Update(float deltaTime) override; - void OnUse(Entity* originator) override; - Entity* GetParentEntity() const; void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;