From fe6a905e55f0472f3ad205ddf35f62be4120f1fa Mon Sep 17 00:00:00 2001
From: Braydon Kains <kainsbraydon@gmail.com>
Date: Wed, 16 Jan 2019 23:54:55 -0500
Subject: [PATCH] I think I just added collide functions I didn't accomplish
 much

---
 .../Assignment3Project.vcxproj                |  2 ++
 .../Assignment3Project.vcxproj.filters        |  6 ++++++
 .../Assignment3Project/bullet.cpp             |  6 +++++-
 .../Assignment3Project/bullet.h               |  2 +-
 .../Assignment3Project/enemy.cpp              | 21 +++++++++++++++++++
 Assignment3Project/Assignment3Project/enemy.h | 15 +++++++++++++
 .../Assignment3Project/game_element.h         |  2 ++
 .../Assignment3Project/ship.cpp               | 18 +++++++++-------
 Assignment3Project/Assignment3Project/ship.h  |  2 +-
 9 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 Assignment3Project/Assignment3Project/enemy.cpp
 create mode 100644 Assignment3Project/Assignment3Project/enemy.h

diff --git a/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj b/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj
index 42c2e56..08cc254 100644
--- a/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj
+++ b/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj
@@ -137,6 +137,7 @@
   <ItemGroup>
     <ClInclude Include="bullet.h" />
     <ClInclude Include="cursor.h" />
+    <ClInclude Include="enemy.h" />
     <ClInclude Include="enums.h" />
     <ClInclude Include="game.h" />
     <ClInclude Include="game_element.h" />
@@ -148,6 +149,7 @@
   <ItemGroup>
     <ClCompile Include="bullet.cpp" />
     <ClCompile Include="cursor.cpp" />
+    <ClCompile Include="enemy.cpp" />
     <ClCompile Include="game.cpp" />
     <ClCompile Include="game_screen.cpp" />
     <ClCompile Include="main.cpp" />
diff --git a/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj.filters b/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj.filters
index bbd419b..f6a7384 100644
--- a/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj.filters
+++ b/Assignment3Project/Assignment3Project/Assignment3Project.vcxproj.filters
@@ -60,6 +60,9 @@
     <ClInclude Include="bullet.h">
       <Filter>Header Files\Assignment3</Filter>
     </ClInclude>
+    <ClInclude Include="enemy.h">
+      <Filter>Header Files\Assignment3</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -83,6 +86,9 @@
     <ClCompile Include="ship.cpp">
       <Filter>Source Files\Assignment3Implement</Filter>
     </ClCompile>
+    <ClCompile Include="enemy.cpp">
+      <Filter>Source Files\Assignment3Implement</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Assignment3Project/Assignment3Project/bullet.cpp b/Assignment3Project/Assignment3Project/bullet.cpp
index d60d256..d9f5b20 100644
--- a/Assignment3Project/Assignment3Project/bullet.cpp
+++ b/Assignment3Project/Assignment3Project/bullet.cpp
@@ -23,4 +23,8 @@ void Bullet::move(Direction dir) {
 	if (y_pos < 0 - height) {
 		oob = true;
 	}
-}
\ No newline at end of file
+}
+
+void Bullet::collide(GameElement * x)
+{
+}
diff --git a/Assignment3Project/Assignment3Project/bullet.h b/Assignment3Project/Assignment3Project/bullet.h
index 85a0544..1d00584 100644
--- a/Assignment3Project/Assignment3Project/bullet.h
+++ b/Assignment3Project/Assignment3Project/bullet.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <allegro5/allegro.h>
 #include <allegro5/allegro_primitives.h>
 
 #include "game_element.h"
@@ -11,4 +10,5 @@ public:
 	void reset_pos(float x, float y);
 	void draw();
 	void move(Direction dir);
+	void collide(GameElement* x);
 };
\ No newline at end of file
diff --git a/Assignment3Project/Assignment3Project/enemy.cpp b/Assignment3Project/Assignment3Project/enemy.cpp
new file mode 100644
index 0000000..d6a81f8
--- /dev/null
+++ b/Assignment3Project/Assignment3Project/enemy.cpp
@@ -0,0 +1,21 @@
+#include "enemy.h"
+
+Enemy::Enemy()
+{
+}
+
+void Enemy::reset_pos(float x, float y)
+{
+}
+
+void Enemy::draw()
+{
+}
+
+void Enemy::move(Direction dir)
+{
+}
+
+void Enemy::collide(GameElement * x)
+{
+}
diff --git a/Assignment3Project/Assignment3Project/enemy.h b/Assignment3Project/Assignment3Project/enemy.h
new file mode 100644
index 0000000..470930b
--- /dev/null
+++ b/Assignment3Project/Assignment3Project/enemy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "game_element.h"
+
+class Enemy : public GameElement {
+public:
+	ALLEGRO_BITMAP* sprite;
+
+	Enemy();
+
+	void reset_pos(float x, float y);
+	void draw();
+	void move(Direction dir);
+	void collide(GameElement* x);
+};
\ No newline at end of file
diff --git a/Assignment3Project/Assignment3Project/game_element.h b/Assignment3Project/Assignment3Project/game_element.h
index 49cead8..9de5c68 100644
--- a/Assignment3Project/Assignment3Project/game_element.h
+++ b/Assignment3Project/Assignment3Project/game_element.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <allegro5/allegro.h>
 
 #include "enums.h"
 
@@ -14,4 +15,5 @@ public:
 	virtual void reset_pos(float x, float y) = 0;
 	virtual void move(Direction dir) = 0;
 	virtual void draw() = 0;
+	virtual void collide(GameElement* x) = 0;
 };
\ No newline at end of file
diff --git a/Assignment3Project/Assignment3Project/ship.cpp b/Assignment3Project/Assignment3Project/ship.cpp
index f560830..c1a77c4 100644
--- a/Assignment3Project/Assignment3Project/ship.cpp
+++ b/Assignment3Project/Assignment3Project/ship.cpp
@@ -25,6 +25,10 @@ void Ship::draw() {
 	al_draw_bitmap(sprite, x_pos, y_pos, NULL);
 }
 
+void Ship::collide(GameElement * x)
+{
+}
+
 void Ship::move(Direction dir) {
 	float factor = 4 * speed;
 	switch (dir) {
@@ -73,12 +77,10 @@ void Ship::move(Direction dir) {
 }
 
 Bullet Ship::fire() {
-	if (!fired) {
-		Bullet new_bullet;
-		float x = (x_pos) + width / 2.0;
-		float y = y_pos - new_bullet.height;
-		new_bullet.reset_pos(x, y);
-		fired = true;
-		return new_bullet;
-	}
+	Bullet new_bullet;
+	float x = (x_pos) + width / 2.0;
+	float y = y_pos - new_bullet.height;
+	new_bullet.reset_pos(x, y);
+	fired = true;
+	return new_bullet;
 }
\ No newline at end of file
diff --git a/Assignment3Project/Assignment3Project/ship.h b/Assignment3Project/Assignment3Project/ship.h
index 3edede7..1f34ebf 100644
--- a/Assignment3Project/Assignment3Project/ship.h
+++ b/Assignment3Project/Assignment3Project/ship.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <allegro5/allegro.h>
 
 #include "enums.h"
 #include "game_element.h"
@@ -19,6 +18,7 @@ public:
 	void reset_pos(float x, float y);
 	void set_sprite(ALLEGRO_BITMAP* _sprite);
 	void draw();
+	void collide(GameElement* x);
 	void move(Direction dir);
 	Bullet fire();
 };
\ No newline at end of file