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 21:28:15 +0000
committerStijn Buys <ingar@osirion.org>2012-11-25 21:28:15 +0000
commitd4ee190ca1d37174da5692a3f391e12d46fe6ea5 (patch)
treec45c9002968f17fffe5bbc29a5e84dcca83bc234 /src/core/slot.h
parent0d9a69607e7538dc46e685ef8e18b5fa343b6241 (diff)
Cleaned up slots API.
Diffstat (limited to 'src/core/slot.h')
-rw-r--r--src/core/slot.h101
1 files changed, 1 insertions, 100 deletions
diff --git a/src/core/slot.h b/src/core/slot.h
index 5cfeb3e..56ee224 100644
--- a/src/core/slot.h
+++ b/src/core/slot.h
@@ -83,55 +83,6 @@ public:
{
return slot_last_fired;
}
-
- /**
- * @brief timestamp indicating when the slot was last fire, client-side
- * This is a client-side property
- * */
- inline unsigned long last_ejected() const
- {
- return slot_last_ejected;
- }
-
- /**
- * @brief interval between two consequtive shots by this slot, in milliseconds
- * */
- inline unsigned long projectile_interval() const
- {
- return slot_projectile_interval;
- }
-
- /**
- * @brief lifespan of a projectile generated by this slot, in milliseconds
- * */
- inline unsigned long projectile_lifespan() const
- {
- return slot_projectile_lifespan;
- }
-
- /**
- * @brief speed of a projectile generated by this slot, in game units per second
- * */
- inline float projectile_speed() const
- {
- return slot_projectile_speed;
- }
-
- /**
- * @brief damage done by a projectile generated by this slot
- * */
- inline float projectile_damage() const
- {
- return slot_projectile_damage;
- }
-
- /**
- * @brief model name used to draw projectiles generated by this slot
- * */
- inline const std::string & projectile_modelname() const
- {
- return slot_projectile_modelname;
- }
/* --- mutators -------------------------------------------- */
@@ -178,40 +129,7 @@ public:
{
slot_last_fired = last_fired;
}
-
- /**
- * @brief set the timestamp when the slat last ejected a projectile, client-side
- * This is a client-side property, to be set by the client
- * */
- inline void set_last_ejected(unsigned long last_ejected)
- {
- slot_last_ejected = last_ejected;
- }
-
- /**
- * @brief set the interval between two shots, in milliseconds
- * */
- void set_projectile_interval(unsigned long projectile_interval);
-
- /**
- * @brief set the lifespan of ejected projectiles, in milliseconds
- * */
- void set_projectile_lifespan(unsigned long projectile_lifespan);
-
- /**
- * @brief set the speed of ejected projectiles, in game units per second
- * */
- void set_projectile_speed(float projectile_speed);
-
- /**
- * @brief set the amount of damage done by a projectile generated by this slot
- * */
- void set_projectile_damage(float projectile_damage);
- /**
- * @brief set the name of model used to draw projectiles generated by this slot
- * */
- void set_projectile_modelname(const std::string & projectile_modelname);
-
+
/**
* @brief set the item this slot is holding
* */
@@ -231,23 +149,6 @@ private:
// timestamp indicating when the slot last generated a projectile, server-side
unsigned long slot_last_fired;
- // timestamp indicating when the slot last generated a projectile, client-side
- unsigned long slot_last_ejected;
-
- // interval between two shots, in milliseconds
- unsigned long slot_projectile_interval;
-
- // projectile lifespan
- unsigned long slot_projectile_lifespan;
-
- // projectile speed, in game units per second
- float slot_projectile_speed;
-
- // projectile damage
- float slot_projectile_damage;
-
- // name of the model used to draw projectiles generated by this slot
- std::string slot_projectile_modelname;
// item mounted in this slot
Item *slot_item;