Changeset 9175 for code/branches/newlevel2012/src

Timestamp:

May 11, 2012, 4:03:28 PM (13 years ago)

Author:

weigeltm

Message:

removed attach-command, got rid of error messages, attached weapons to towers

Location:

code/branches/newlevel2012/src

Files:

• modules/towerdefense/Tower.cc (modified) (1 diff)
• modules/towerdefense/Tower.h (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (2 diffs)
• modules/towerdefense/TowerDefenseCenterpoint.h (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/newlevel2012/src/modules/towerdefense/Tower.cc

@@ -22 +22 @@
          Constructor. Registers and initializes the object.
          */
-    Tower::Tower(BaseObject* creator) : ControllableEntity(creator)
+    Tower::Tower(BaseObject* creator) : SpaceShip(creator)
     {
         RegisterObject(Tower);
+
+        this->setCollisionType(WorldEntity::Dynamic);
+
+
+
         /*
         this->size_ = 10.0f;

code/branches/newlevel2012/src/modules/towerdefense/Tower.h

@@ -19 +19 @@
 
 #include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Tower : public ControllableEntity
+    class _OrxonoxExport Tower : public SpaceShip
     {
         public:

code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc

@@ -118 +118 @@
         void TowerDefense::setCenterpoint(TowerDefenseCenterpoint *centerpoint)
         {
+                orxout() << "Centerpoint now setting..." << endl;
+                this->center_ = centerpoint;
                 orxout() << "Centerpoint now set..." << endl;
-                this->center_ = centerpoint;
         }
         
@@ -191 +192 @@
                 Tower* newTower = new Tower(this->center_);
                 newTower->addTemplate(this->center_->getTowerTemplate());
-                
-                this->center_->attach(newTower);
-                
+
+                //this->center_->attach(newTower);
+
                 newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 100);
                 newTower->setGame(this);
-                
                 //TODO: Save the Tower in a Vector. I would suggest std::vector< std::vector<Tower*> > towers_ as a protected member variable;
                 

code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -47 +47 @@
         Constructor. Registers and initializes the object and checks whether the gametype is actually TowerDefense.
     */
-    TowerDefenseCenterpoint::TowerDefenseCenterpoint(BaseObject* creator) : StaticEntity(creator)
+    TowerDefenseCenterpoint::TowerDefenseCenterpoint(BaseObject* creator) : MobileEntity(creator)
     {
         RegisterObject(TowerDefenseCenterpoint);
@@ -55 +55 @@
         this->towerTemplate_ = "";
         
+        //this->setCollisionType(Static);
+
                 this->checkGametype();
+
     }
 

code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h

@@ -42 +42 @@
 #include <util/Math.h>
 
-#include "worldentities/StaticEntity.h"
+#include "worldentities/MobileEntity.h"
 
 namespace orxonox
 {
-    class _TowerDefenseExport TowerDefenseCenterpoint : public StaticEntity
+    class _TowerDefenseExport TowerDefenseCenterpoint : public MobileEntity
     {
         public:

code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc

@@ -379 +379 @@
         if (!object->notifyBeingAttached(this))
             return;
-
         this->attachNode(object->node_);
         this->children_.insert(object);