Changeset 2896 for code/trunk/src/orxonox/objects/pickup

Timestamp:

Apr 6, 2009, 1:59:00 AM (16 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.cc (modified) (1 diff)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)

code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -89 +89 @@
                 ExecutorMember<BaseObject>* executor = createExecutor(createFunctor(&BaseObject::setActive));
                 executor->setDefaultValues(true);
-                RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
+                RespawnTimer_.setTimer(this->respawntimer_, false, this, executor);
                 COUT(0) << "TIMER SET" << std::endl;
         }