Changeset 5935 for code/branches/pickup/src/libraries/core/input/Mouse.cc

Timestamp:

Oct 13, 2009, 5:05:17 PM (15 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/libraries/core/input/Mouse.cc (modified) (1 diff)

code/branches/pickup/src/libraries/core/input/Mouse.cc

@@ -48 +48 @@
 
 #ifdef ORXONOX_PLATFORM_LINUX
-        {
-            // Mouse grab console command
-            FunctorMember<Mouse>* functor = createFunctor(&Mouse::grab);
-            functor->setObject(this);
-            this->getIdentifier()->addConsoleCommand(createConsoleCommand(functor, "grab"), false);
-        }
-        {
-            // Mouse ungrab console command
-            FunctorMember<Mouse>* functor = createFunctor(&Mouse::ungrab);
-            functor->setObject(this);
-            this->getIdentifier()->addConsoleCommand(createConsoleCommand(functor, "ungrab"), false);
-        }
+        // Mouse grab console command
+        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&Mouse::grab, this), "grab"), false);
+        // Mouse ungrab console command
+        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&Mouse::ungrab, this), "ungrab"), false);
 #endif
     }