diff options
author | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:19 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:19 +0000 |
commit | 0cf596e0505f1198748931787b93f469f3e58db7 (patch) | |
tree | 04404ff2404c824ff7a3c7c5a1703fe0a1878708 /src/core/slot.cc | |
parent | 6b737ea7f6e5a31d3c6024105ee11890f1a5451f (diff) |
Add more Slot properties, corrected a bug in EntityControlable control flags handling.
Diffstat (limited to 'src/core/slot.cc')
-rw-r--r-- | src/core/slot.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/core/slot.cc b/src/core/slot.cc index 89f885c..ace3be2 100644 --- a/src/core/slot.cc +++ b/src/core/slot.cc @@ -6,6 +6,7 @@ #include "core/slot.h" #include "core/item.h" +#include "core/application.h" namespace core { @@ -13,24 +14,40 @@ namespace core Slot::Slot() { slot_item = 0; - slot_active = true; + slot_flags = 0; slot_timestamp = 0; + slot_last_fired = 0; + + slot_interval = 0; + slot_lifespan = 0; + slot_speed = 0.0f; + + } Slot::Slot(const math::Vector3f & location) : slot_location(location) { slot_item = 0; - slot_active = true; + slot_flags = 0; slot_timestamp = 0; + slot_last_fired = 0; + slot_interval = 0;; + slot_lifespan = 0; + slot_speed = 0.0f; } Slot::~Slot() { slot_item = 0; - slot_active = false; + slot_flags = 0; slot_timestamp = 0; + slot_last_fired = 0; + + slot_interval = 0; + slot_lifespan = 0; + slot_speed = 0.0f; } void Slot::set_item(Item *item) |