Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-11-25 12:06:13 +0000
committerStijn Buys <ingar@osirion.org>2012-11-25 12:06:13 +0000
commitd8be908233fd7b85492d7a9e87f07bb207173990 (patch)
tree70d9103a867688838fc517290bb370366c69fedb /src/game/base/projectile.h
parentedc5ddce817244111b302e449c28a052f2746cc4 (diff)
Moved core::EntityGlobe into a separate file,
added various methods to core::Item and core::Slot, added r_slots cvar to draw entity slots and docks, added game methods for mounting and umounting of weapons, added playerlist to chat window.
Diffstat (limited to 'src/game/base/projectile.h')
-rw-r--r--src/game/base/projectile.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/base/projectile.h b/src/game/base/projectile.h
index f9cda64..2513901 100644
--- a/src/game/base/projectile.h
+++ b/src/game/base/projectile.h
@@ -1,5 +1,5 @@
/*
- base/spacemine.h
+ base/projectile.h
This file is part of the Osirion project and is distributed under
the terms and conditions of the GNU General Public License version 2
*/
@@ -12,11 +12,11 @@
namespace game
{
-class Projectile : public core::EntityDynamic
+class EntityProjectile : public core::EntityDynamic
{
public:
- Projectile(unsigned long lifespan);
- virtual ~Projectile();
+ EntityProjectile(unsigned long lifespan);
+ virtual ~EntityProjectile();
virtual void upkeep(const unsigned long timestamp);
@@ -58,6 +58,11 @@ public:
/* --- mutators -------------------------------------------- */
/**
+ * @brief reset physics state
+ * */
+ virtual void reset();
+
+ /**
* @brief set the amount of damage this projectile inflicts
* */
inline void set_damage(const float damage)