X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.cpp;h=dd80007d1998cc4c4772848c35580a53fe2f9859;hb=a42277d4d950d32459b16b3ec8ee8287c9c0afab;hp=93af822b8476008c2f60e6158955078cdaf38c0d;hpb=e8987f4028a1f9c0eeb33a45bd11b2e409b9c2c5;p=architektonas diff --git a/src/object.cpp b/src/object.cpp index 93af822..dd80007 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -33,17 +33,18 @@ bool Object::dontMove = false; bool Object::selectionInProgress = false; QRectF Object::selection; double Object::gridSpacing; +int Object::currentLayer = 0; Object::Object(): position(Vector(0, 0)), parent(0), type(OTObject), - state(OSInactive), oldState(OSInactive), needUpdate(false) + state(OSInactive), layer(0), oldState(OSInactive), needUpdate(false) //, attachedDimension(0) { } Object::Object(Vector v, Object * passedInParent/*= 0*/): position(v), - parent(passedInParent), state(OSInactive), oldState(OSInactive), + parent(passedInParent), state(OSInactive), layer(0), oldState(OSInactive), needUpdate(false)//, attachedDimension(0) { } @@ -233,6 +234,12 @@ printf("Object: Destroyed!\n"); } +/*virtual*/ Object * Object::Mirror(Vector, Vector) +{ + return NULL; +} + + ObjectState Object::GetState(void) { return state;