diff --git a/Assignment3Project/Assignment3Project/bullet.cpp b/Assignment3Project/Assignment3Project/bullet.cpp index d9f5b20..d60d256 100644 --- a/Assignment3Project/Assignment3Project/bullet.cpp +++ b/Assignment3Project/Assignment3Project/bullet.cpp @@ -23,8 +23,4 @@ void Bullet::move(Direction dir) { if (y_pos < 0 - height) { oob = true; } -} - -void Bullet::collide(GameElement * x) -{ -} +} \ No newline at end of file diff --git a/Assignment3Project/Assignment3Project/bullet.h b/Assignment3Project/Assignment3Project/bullet.h index 1d00584..37d6c35 100644 --- a/Assignment3Project/Assignment3Project/bullet.h +++ b/Assignment3Project/Assignment3Project/bullet.h @@ -10,5 +10,4 @@ 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 index d6a81f8..f832355 100644 --- a/Assignment3Project/Assignment3Project/enemy.cpp +++ b/Assignment3Project/Assignment3Project/enemy.cpp @@ -15,7 +15,3 @@ 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 index 470930b..e1b39f1 100644 --- a/Assignment3Project/Assignment3Project/enemy.h +++ b/Assignment3Project/Assignment3Project/enemy.h @@ -11,5 +11,4 @@ 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/game_element.h b/Assignment3Project/Assignment3Project/game_element.h index 9de5c68..853f06e 100644 --- a/Assignment3Project/Assignment3Project/game_element.h +++ b/Assignment3Project/Assignment3Project/game_element.h @@ -15,5 +15,4 @@ 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 c1a77c4..5b792f3 100644 --- a/Assignment3Project/Assignment3Project/ship.cpp +++ b/Assignment3Project/Assignment3Project/ship.cpp @@ -25,10 +25,6 @@ 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) { diff --git a/Assignment3Project/Assignment3Project/ship.h b/Assignment3Project/Assignment3Project/ship.h index 1f34ebf..b034963 100644 --- a/Assignment3Project/Assignment3Project/ship.h +++ b/Assignment3Project/Assignment3Project/ship.h @@ -18,7 +18,6 @@ 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 diff --git a/cheesetheme.wav b/cheesetheme.wav new file mode 100644 index 0000000..32a1e3b Binary files /dev/null and b/cheesetheme.wav differ