diff options
-rw-r--r-- | .doxygen | 2 | ||||
-rw-r--r-- | cObject.cpp | 1 | ||||
-rw-r--r-- | cObject.h | 2 | ||||
-rw-r--r-- | cObjectHandler.cpp | 6 |
4 files changed, 4 insertions, 7 deletions
@@ -159,7 +159,7 @@ FILE_PATTERNS = *.c \ *.ucf \ *.qsf RECURSIVE = NO -EXCLUDE = +EXCLUDE = test.cpp version.h EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = diff --git a/cObject.cpp b/cObject.cpp index cfd433b..7dc194c 100644 --- a/cObject.cpp +++ b/cObject.cpp @@ -34,6 +34,7 @@ sObject cObject::getObject() } //protected +cObject::cObject() : pos({0,0}) , bSizeSet(false){} void cObject::setSize(int _sx, int _sy) { @@ -61,7 +61,7 @@ public: virtual void onChar(unsigned char _c){} protected: //For child classes - cObject() : pos({0,0}) , bSizeSet(false){} + cObject(); /** For inheriting classes: sets size of framebuffer */ void setSize(int _sx, int _sy); diff --git a/cObjectHandler.cpp b/cObjectHandler.cpp index 8a62a52..ee47226 100644 --- a/cObjectHandler.cpp +++ b/cObjectHandler.cpp @@ -1,13 +1,9 @@ #include "cObjectHandler.h" -cObjectHandler::cObjectHandler(cRender *_render) +cObjectHandler::cObjectHandler(cRender *_render) : cameraPosition ({0,0}), iActiveObject(0) { render = _render; - cameraPosition = {0,0}; - - iActiveObject = 0; - objects.push_back(NULL); //Create first Object as Catcher for Events buildHitmap(); |