Changeset 1789 for code/trunk/src/orxonox

Timestamp:

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

Author:

rgrieder

Message:

reverted r1787

Location:

code/trunk/src/orxonox/objects

Files:

• Model.cc (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• SpaceShip.cc (modified) (4 diffs)

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();*/
     }