[a] Moved the CollideCheck into a method on the GameObject class

3 files changed, 16 insertions, 15 deletions

diff --git a/Space Invaders/GameEngine/GameEngine.cs b/Space Invaders/GameEngine/GameEngine.cs
index 6c5c5b0..bba5838 100644
--- a/Space Invaders/GameEngine/GameEngine.cs
+++ b/Space Invaders/GameEngine/GameEngine.cs
@@ -132,6 +132,16 @@ namespace GameEngine {
             // This method is called after the frame is rendered
         }
 
+        public bool CollidingWith(GameObject other) {
+            // This method checks if 'this' collides with another GameObject
+            // TODO Make this check if the position contains '\0', if so we are not colliding. This will make hitboxes more natural
+            int x1 = other.xPos;
+            int x2 = other.xPos + other.Sprite.GetLength(1);
+            int y1 = other.yPos;
+            int y2 = other.yPos + other.Sprite.GetLength(0);
+            return (x1 < xPos && xPos < x2 && y1 < yPos && yPos < y2);
+        }
+
         public void ScaleSprite() {
             // This is called after the Update method, and scales the sprite if it has changed
             if (RenderedSprite == Sprite) { return; }
diff --git a/Space Invaders/GameObjects.cs b/Space Invaders/GameObjects.cs
index f7297a1..26533d6 100644
--- a/Space Invaders/GameObjects.cs
+++ b/Space Invaders/GameObjects.cs
@@ -5,6 +5,10 @@ namespace SpaceInvaders {
 
     class GameLogic : GameObject {
 
+        public override void Start() {
+            
+        }
+
         public override void Update() {
 
             if (Input.KeyPressed(ConsoleKey.Escape)) {
@@ -44,22 +48,14 @@ namespace SpaceInvaders {
                 GameObject other = Parent.GameObjects[i];
 
                 if (other.Tag == "Enemy") {
-                    int x1 = other.xPos;
-                    int x2 = other.xPos + other.Sprite.GetLength(1);
-                    int y1 = other.yPos;
-                    int y2 = other.yPos + other.Sprite.GetLength(0);
-                    if (x1 <= xPos && xPos <= x2 && y1 <= yPos && yPos <= y2) {
+                    if (CollidingWith(other)) {
                         other.isDead = true;
                         isDead = true;
                     }
                 }
 
                 if (other.Tag == "Obstacle") {
-                    int x1 = other.xPos;
-                    int x2 = other.xPos + other.Sprite.GetLength(1);
-                    int y1 = other.yPos;
-                    int y2 = other.yPos + other.Sprite.GetLength(0);
-                    if (x1 <= xPos && xPos <= x2 && y1 <= yPos && yPos <= y2) {
+                    if (CollidingWith(other)) {
                         isDead = true;
                     }
                 }
diff --git a/Space Invaders/Program.cs b/Space Invaders/Program.cs
index bf9751d..769bc0c 100644
--- a/Space Invaders/Program.cs
+++ b/Space Invaders/Program.cs
@@ -37,13 +37,8 @@ namespace SpaceInvaders {
             player.yPos = 115;
             player.Scale = 1;
             GameObjects.Add(player);
-            
-            // Init a monster
-            GameObject monster1 = new Monster();
-            GameObjects.Add(monster1);
 
             // Init Obstacles
-
             for (int i = 0; i < 6; i++) {
                 GameObject obstacle = new Obstacle();
                 player.Parent = this;