Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner

2 files changed, 0 insertions, 46 deletions

diff --git a/bullet.cpp b/bullet.cpp
deleted file mode 100644
index b7df9fb..0000000
--- a/bullet.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "bullet.h"
-
-Bullet::Bullet() {
-}
-
-Bullet::Bullet(const Vector3& pos, const Vector3& direction, float radius) {
-	this->pos = pos;
-	this->direction = direction;
-	this->radius = radius;
-}
-
-Bullet::Bullet(const Bullet& b) {
-	pos = b.pos;
-	direction = b.direction;
-	radius = b.radius;
-}
-
-Bullet& Bullet::operator=(const Bullet& b) {
-	pos = b.pos;
-	direction = b.direction;
-	radius = b.radius;
-	return *this;
-}
-
-Bullet::~Bullet() {
-}
diff --git a/bullet.h b/bullet.h
deleted file mode 100644
index 23a4a3f..0000000
--- a/bullet.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BULLET_H_
-#define _BULLET_H_
-
-#include "vector.h"
-
-class Bullet {
-	public:
-		Vector3 pos;
-		Vector3 direction;
-		float radius;
-
-		Bullet();
-		Bullet(const Vector3& pos, const Vector3& direction, float radius);
-		Bullet(const Bullet& b);
-		~Bullet();
-
-		Bullet& operator=(const Bullet& b);
-};
-
-#endif