#include <config.h>
#include <math.h>
-#include "bullet.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "sprite/sprite_manager.h"
-#include "badguy/badguy.h"
-#include "main.h"
+#include "bullet.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "badguy/badguy.hpp"
+#include "main.hpp"
-static const float BULLET_XM = 300;
+static const float BULLET_XM = 600;
static const float BULLET_STARTING_YM = 0;
Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
if (kind == ICE_BULLET) {
life_count = 6; //ice-bullets get "extra lives" for bumping off walls
- sprite = sprite_manager->create("icebullet");
+ sprite = sprite_manager->create("images/objects/bullets/icebullet.sprite");
} else if(kind == FIRE_BULLET) {
- sprite = sprite_manager->create("firebullet");
+ sprite = sprite_manager->create("images/objects/bullets/firebullet.sprite");
}
}
}
void
-Bullet::action(float elapsed_time)
+Bullet::update(float elapsed_time)
{
if(kind == FIRE_BULLET) {
// @not completely framerate independant :-/