I don't know what I changed really other than adding the song

main
BraydonKains 6 years ago
parent fe6a905e55
commit b23cf828d1

@ -23,8 +23,4 @@ void Bullet::move(Direction dir) {
if (y_pos < 0 - height) { if (y_pos < 0 - height) {
oob = true; oob = true;
} }
} }
void Bullet::collide(GameElement * x)
{
}

@ -10,5 +10,4 @@ public:
void reset_pos(float x, float y); void reset_pos(float x, float y);
void draw(); void draw();
void move(Direction dir); void move(Direction dir);
void collide(GameElement* x);
}; };

@ -15,7 +15,3 @@ void Enemy::draw()
void Enemy::move(Direction dir) void Enemy::move(Direction dir)
{ {
} }
void Enemy::collide(GameElement * x)
{
}

@ -11,5 +11,4 @@ public:
void reset_pos(float x, float y); void reset_pos(float x, float y);
void draw(); void draw();
void move(Direction dir); void move(Direction dir);
void collide(GameElement* x);
}; };

@ -15,5 +15,4 @@ public:
virtual void reset_pos(float x, float y) = 0; virtual void reset_pos(float x, float y) = 0;
virtual void move(Direction dir) = 0; virtual void move(Direction dir) = 0;
virtual void draw() = 0; virtual void draw() = 0;
virtual void collide(GameElement* x) = 0;
}; };

@ -25,10 +25,6 @@ void Ship::draw() {
al_draw_bitmap(sprite, x_pos, y_pos, NULL); al_draw_bitmap(sprite, x_pos, y_pos, NULL);
} }
void Ship::collide(GameElement * x)
{
}
void Ship::move(Direction dir) { void Ship::move(Direction dir) {
float factor = 4 * speed; float factor = 4 * speed;
switch (dir) { switch (dir) {

@ -18,7 +18,6 @@ public:
void reset_pos(float x, float y); void reset_pos(float x, float y);
void set_sprite(ALLEGRO_BITMAP* _sprite); void set_sprite(ALLEGRO_BITMAP* _sprite);
void draw(); void draw();
void collide(GameElement* x);
void move(Direction dir); void move(Direction dir);
Bullet fire(); Bullet fire();
}; };

Binary file not shown.
Loading…
Cancel
Save