From 7899750284135bcc1225c081c6f799cecb70b4c8 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Tue, 6 Oct 2015 15:54:48 +0200 Subject: [PATCH] Potential fix to crazy memory bug? --- src/game/Game/PadSystem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index acee604..449c856 100755 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -196,8 +196,8 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event) { - EntityID entityPower; - EntityID entityPad; + EntityID entityPower = 0; + EntityID entityPad = 0; auto powerUp = m_World->GetComponent(event.Entity1); auto pad = m_World->GetComponent(event.Entity2); if (powerUp != nullptr) { @@ -217,7 +217,7 @@ bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event) } } - if (entityPower == NULL || entityPad == NULL) { + if (entityPower == 0 || entityPad == 0) { return false; }