From 0cf596e0505f1198748931787b93f469f3e58db7 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 14 Nov 2012 16:03:19 +0000 Subject: Add more Slot properties, corrected a bug in EntityControlable control flags handling. --- src/core/slot.cc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/core/slot.cc') 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) -- cgit v1.2.3