X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.cpp;h=4be11f55fa0961ceb78202881bcc3b2bc0ce577c;hb=fa8da664bfb749497b1b2d2991077af0554cc369;hp=c2e874c415ed56db511c90dd6a5db05a03a4203e;hpb=9f6ad3fe0b9cb30115a5d38e8af3aebed0d70c08;p=architektonas

diff --git a/src/object.cpp b/src/object.cpp
index c2e874c..4be11f5 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -21,15 +21,16 @@ bool Object::fixedAngle = false;
 bool Object::fixedLength = false;
 QFont * Object::font = 0;
 int Object::viewportHeight = 0;
+bool Object::deleteActive = false;
 
 
 Object::Object(): position(Vector(0, 0)), parent(0), state(OSInactive), oldState(OSInactive),
-	needUpdate(false)
+	needUpdate(false), dimPoint1(0), dimPoint2(0)
 {
 }
 
 Object::Object(Vector v,  Object * passedInParent/*= 0*/): position(v), parent(passedInParent),
-	state(OSInactive), oldState(OSInactive), needUpdate(false)
+	state(OSInactive), oldState(OSInactive), needUpdate(false), dimPoint1(0), dimPoint2(0)
 {
 }
 
@@ -64,6 +65,11 @@ Object::~Object()
 	return needUpdate;
 }
 
+// This is intended to be overridden by the Container class, for object morphing
+/*virtual*/ void Object::Transmute(Object *, Object *)
+{
+}
+
 ObjectState Object::GetState(void)
 {
 	return state;
@@ -90,3 +96,8 @@ void Object::SetViewportHeight(int height)
 {
 	viewportHeight = height;
 }
+
+void Object::SetDeleteActive(bool state/*= true*/)
+{
+	deleteActive = state;
+}