summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-05-20 22:28:40 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-05-20 22:28:40 +0200
commitd991499bd4ac6debef314ce9d870687e2d283627 (patch)
treed5b54bbecaac0a79027415273f1705333faafbb0
parent208b41573cc0cafb8428705cb997247a50b5553d (diff)
parentc40a1a9b028c728bc2a8a1d9eeb9eee7d10df7a6 (diff)
Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner
-rw-r--r--bullet.cpp26
-rw-r--r--bullet.h20
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