From 82e4dcc1c40889fecc3d4dd5e2c4414baeece971 Mon Sep 17 00:00:00 2001 From: SergoDobro Date: Wed, 16 Aug 2023 15:49:48 +0300 Subject: [PATCH] added GameObject to OnCollision --- DangerousD/GameCore/GameObjects/GameObject.cs | 2 +- DangerousD/GameCore/Managers/PhysicsManager.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DangerousD/GameCore/GameObjects/GameObject.cs b/DangerousD/GameCore/GameObjects/GameObject.cs index a29eb79..078a850 100644 --- a/DangerousD/GameCore/GameObjects/GameObject.cs +++ b/DangerousD/GameCore/GameObjects/GameObject.cs @@ -30,7 +30,7 @@ namespace DangerousD.GameCore AppManager.Instance.GameManager.Register(this); } - public virtual void OnCollision() + public virtual void OnCollision(GameObject gameObject) { } diff --git a/DangerousD/GameCore/Managers/PhysicsManager.cs b/DangerousD/GameCore/Managers/PhysicsManager.cs index 19c84ad..8fc47c0 100644 --- a/DangerousD/GameCore/Managers/PhysicsManager.cs +++ b/DangerousD/GameCore/Managers/PhysicsManager.cs @@ -108,8 +108,8 @@ namespace DangerousD.GameCore.Managers { if (livingEntities[j].Rectangle.Intersects(entities[i].Rectangle)) { - livingEntities[j].OnCollision(); - entities[i].OnCollision(); + livingEntities[j].OnCollision(entities[i]); + entities[i].OnCollision(livingEntities[j]); } } } @@ -123,8 +123,8 @@ namespace DangerousD.GameCore.Managers { if (livingEntities[i].Rectangle.Intersects(livingEntities[j].Rectangle)) { - livingEntities[i].OnCollision(); - livingEntities[j].OnCollision(); + livingEntities[i].OnCollision(livingEntities[j]); + livingEntities[j].OnCollision(livingEntities[i]); } } }