Changeset 9302 for code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc

Timestamp:

Jun 17, 2012, 6:24:06 PM (12 years ago)

Author:

landauf

Message:

small cleanup. calling addTemplate() only once instead of twice

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc (modified) (3 diffs)

code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc

@@ -151 +151 @@
         Returns a pointer to the StaticEntity.
     */
-    StaticEntity* PickupRepresentation::getSpawnerRepresentation(PickupSpawner* spawner)
+    StaticEntity* PickupRepresentation::createSpawnerRepresentation(PickupSpawner* spawner)
     {
         if(this->spawnerRepresentation_ == NULL)
@@ -158 +158 @@
             if(this->spawnerTemplate_ == "")
             {
-                orxout(verbose, context::pickups) << "PickupRepresentation: Spawner template is empty." << endl;
+                orxout(internal_warning, context::pickups) << "PickupRepresentation: Spawner template is empty." << endl;
                 // If neither spawnerRepresentation nor spawnerTemplate was specified
                 return this->getDefaultSpawnerRepresentation(spawner);
@@ -165 +165 @@
         }
 
-        StaticEntity* representation = this->spawnerRepresentation_;
-        representation->setVisible(true);
-
-        this->addTemplate(this->spawnerTemplate_);
-        this->spawnerRepresentation_->setVisible(false);
-
-        return representation;
+        this->spawnerRepresentation_->setVisible(true);
+        StaticEntity* temp = this->spawnerRepresentation_;
+        this->spawnerRepresentation_ = NULL;
+
+        return temp;
     }