diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/entity.cc | 1 | ||||
| -rw-r--r-- | src/core/slot.cc | 53 | ||||
| -rw-r--r-- | src/core/slot.h | 137 | ||||
| -rw-r--r-- | src/core/slots.cc | 4 |
4 files changed, 129 insertions, 66 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index a53f8b8..462a46d 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -877,6 +877,7 @@ void EntityDynamic::reset() } /* Does not work + * Note: does not do what you'd think it does if (entity_mass) { diff --git a/src/core/slot.cc b/src/core/slot.cc index ace3be2..bb7b622 100644 --- a/src/core/slot.cc +++ b/src/core/slot.cc @@ -18,36 +18,44 @@ Slot::Slot() slot_timestamp = 0; slot_last_fired = 0; - slot_interval = 0; - slot_lifespan = 0; - slot_speed = 0.0f; + slot_projectile_interval = 0;; + slot_projectile_lifespan = 0; + slot_projectile_speed = 0.0f; + slot_projectile_damage = 0.0f; +} - +Slot::~Slot() +{ } -Slot::Slot(const math::Vector3f & location) : - slot_location(location) +void Slot::set_projectile_speed(const float projectile_speed) { - slot_item = 0; - slot_flags = 0; - slot_timestamp = 0; - slot_last_fired = 0; - - slot_interval = 0;; - slot_lifespan = 0; - slot_speed = 0.0f; + slot_projectile_speed = projectile_speed; + set_timestamp(game() ? game()->timestamp() : 1); } -Slot::~Slot() +void Slot::set_projectile_interval(unsigned long projectile_interval) { - slot_item = 0; - slot_flags = 0; - slot_timestamp = 0; - slot_last_fired = 0; + slot_projectile_interval = projectile_interval; + set_timestamp(game() ? game()->timestamp() : 1); +} + +void Slot::set_projectile_lifespan(unsigned long projectile_lifespan) +{ + slot_projectile_lifespan = projectile_lifespan; + set_timestamp(game() ? game()->timestamp() : 1); +} - slot_interval = 0; - slot_lifespan = 0; - slot_speed = 0.0f; +void Slot::set_projectile_damage(const float projectile_damage) +{ + slot_projectile_damage = projectile_damage; + set_timestamp(game() ? game()->timestamp() : 1); +} + +void Slot::set_projectile_modelname(const std::string & projectile_modelname) +{ + slot_projectile_modelname.assign(projectile_modelname); + set_timestamp(game() ? game()->timestamp() : 1); } void Slot::set_item(Item *item) @@ -57,4 +65,3 @@ void Slot::set_item(Item *item) } } // namespace core - diff --git a/src/core/slot.h b/src/core/slot.h index 6b6c47b..2d636b3 100644 --- a/src/core/slot.h +++ b/src/core/slot.h @@ -29,12 +29,7 @@ public: * Creates an empty slot * */ Slot(); - - /** - * @brief creates and empty slot at a given location - * */ - Slot(const math::Vector3f & location); - + /** * @brief default destructor * */ @@ -55,32 +50,63 @@ public: { return slot_axis; } - - /** - * @brief the name of the particlesystem used to render - * projectiles generated by this slot - * */ /** + * @brief timestamp indicating when the slot was last fired,server-side + * This is a server-side property * */ inline unsigned long last_fired() const { return slot_last_fired; } - inline unsigned long interval() const + /** + * @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_interval; + return slot_projectile_interval; } - inline unsigned long lifespan() const + /** + * @brief lifespan of a projectile generated by this slot, in milliseconds + * */ + inline unsigned long projectile_lifespan() const { - return slot_lifespan; + return slot_projectile_lifespan; } - inline float speed() const + /** + * @brief speed of a projectile generated by this slot, in game units per second + * */ + inline float projectile_speed() const { - return slot_speed; + 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 -------------------------------------------- */ @@ -111,27 +137,46 @@ public: } /** - * @brief + * @brief set the timestamp when the slot last ejected a projectile, server-side + * This is a server-side property, to be set by the game module * */ inline void set_last_fired(unsigned long last_fired) { slot_last_fired = last_fired; } - inline void set_interval(unsigned long interval) + /** + * @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_interval = interval; + slot_last_ejected = last_ejected; } - inline void set_lifespan(unsigned long lifespan) - { - slot_lifespan = lifespan; - } + /** + * @brief set the interval between two shots, in milliseconds + * */ + void set_projectile_interval(unsigned long projectile_interval); - inline void set_speed(float speed) - { - slot_speed = speed; - } + /** + * @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 @@ -139,33 +184,41 @@ public: void set_item(Item *item); private: - math::Vector3f slot_location; + math::Vector3f slot_location; - math::Axis slot_axis; + math::Axis slot_axis; // slot flags - unsigned int slot_flags; + unsigned int slot_flags; + + // timestamp indicating when the slot configuration was last changed + unsigned long slot_timestamp; - unsigned long slot_timestamp; + // timestamp indicating when the slot last generated a projectile, server-side + unsigned long slot_last_fired; - 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_interval; + unsigned long slot_projectile_interval; - // projectile lifespane - unsigned long slot_lifespan; + // projectile lifespan + unsigned long slot_projectile_lifespan; - // projectile speed, in gameunits / second - float slot_speed; + // projectile speed, in game units per second + float slot_projectile_speed; - // item mounted in this slot - Item *slot_item; + // projectile damage + float slot_projectile_damage; + + // name of the model used to draw projectiles generated by this slot + std::string slot_projectile_modelname; - std::string slot_particlesystem_name; + // item mounted in this slot + Item *slot_item; }; } // namespace core #endif // __INCLUDED_CORE_SLOTS_H__ - diff --git a/src/core/slots.cc b/src/core/slots.cc index 031aba2..9bf557f 100644 --- a/src/core/slots.cc +++ b/src/core/slots.cc @@ -22,7 +22,9 @@ Slots::~Slots() void Slots::load(model::Model *model) { for (model::Model::Weapons::iterator it = model->weapons().begin(); it != model->weapons().end(); ++it) { - Slot *slot = new Slot((*it)->location()); + Slot *slot = new Slot(); + slot->set_location((*it)->location()); + slot->set_axis((*it)->axis()); slots_container.push_back(slot); } //con_debug << " loaded " << slots_container.size() << " entity slots" << std::endl; |