Changeset 1789

Timestamp:

Sep 15, 2008, 9:31:55 PM (16 years ago)

Author:

rgrieder

Message:

reverted r1787

Location:

code/trunk/src

Files:

• core/CoreIncludes.h (modified) (1 diff)
• core/XMLPort.cc (modified) (1 diff)
• core/XMLPort.h (modified) (3 diffs)
• orxonox/objects/Model.cc (modified) (1 diff)
• orxonox/objects/Projectile.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (4 diffs)

code/trunk/src/core/CoreIncludes.h

@@ -97 +97 @@
     @param ClassName The name of the class
 */
-#define GetClassIdentifier(ClassName) \
+#define Class(ClassName) \
     ClassIdentifier<ClassName>::getIdentifier()
 

code/trunk/src/core/XMLPort.cc

@@ -40 +40 @@
     bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
     {
-        return ((!this->bApplyLoaderMask_) || identifier->isA(GetClassIdentifier(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
+        return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
     }
 }

code/trunk/src/core/XMLPort.h

@@ -301 +301 @@
                                 if (identifier)
                                 {
-                                    if (identifier->isA(GetClassIdentifier(O)))
+                                    if (identifier->isA(Class(O)))
                                     {
                                         if (this->identifierIsIncludedInLoaderMask(identifier))
@@ -333 +333 @@
                                     else
                                     {
-                                        COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << GetClassIdentifier(O)->getName() << "'." << std::endl;
+                                        COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << Class(O)->getName() << "'." << std::endl;
                                     }
                                 }
@@ -346 +346 @@
                     {
                         COUT(1) << std::endl;
-                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << GetClassIdentifier(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
+                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << Class(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
                         COUT(1) << ex.what() << std::endl;
                     }

code/trunk/src/orxonox/objects/Model.cc

@@ -85 +85 @@
         COUT(4) << "Loader (Model.cc): Created model" << std::endl;
       }
-      if(this->isExactlyA(GetClassIdentifier(Model)))
+      if(this->isExactlyA(Class(Model)))
         setObjectFrequency(300); //sync all 10 seconds (this only applies to asteroids and other isExactlyA(Model)
       return true;

code/trunk/src/orxonox/objects/Projectile.cc

@@ -101 +101 @@
                 {
                     // hit
-                    if (it->isA(GetClassIdentifier(SpaceShipAI)))
+                    if (it->isA(Class(SpaceShipAI)))
                         ((SpaceShipAI*)(*it))->damage(this->damage_);
                     ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, LODParticle::low, 2.0);

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -77 +77 @@
       ObjectList<SpaceShip>::iterator it;
       for(it = ObjectList<SpaceShip>::begin(); it; ++it){
-        assert(it->isA(GetClassIdentifier(SpaceShip)));
+        assert(it->isA(Class(SpaceShip)));
         if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) ){
 //        COUT(1) << "^^^^^^^^^^ myShip_:" << *it << " classname: " << (*it)->getIdentifier()->getName() << " objectid: " << (*it)->objectID << std::endl;
@@ -273 +273 @@
             // END CREATING ADDITIONAL EFFECTS
 
-            if (this->isExactlyA(GetClassIdentifier(SpaceShip)))
+            if (this->isExactlyA(Class(SpaceShip)))
             {
                 // START of testing crosshair
@@ -376 +376 @@
         COUT(4) << "requesting focus for camera" << std::endl;
         //CameraHandler::getInstance()->requestFocus(cam_);
-        if(this->isExactlyA(GetClassIdentifier(SpaceShip))){
+        if(this->isExactlyA(Class(SpaceShip))){
           getFocus();
           COUT(4) << "getting focus for obj id: " << objectID << std::endl;
@@ -421 +421 @@
         myShip_=true; //TODO: this is a hack
         SpaceShip::create();
-        /*if (this->isExactlyA(GetClassIdentifier(SpaceShip)))
+        /*if (this->isExactlyA(Class(SpaceShip)))
             getFocus();*/
     }