Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/pickup

Timestamp:

Apr 8, 2009, 12:58:47 AM (17 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

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

code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc

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