Changeset 11497 for code/branches/HUD_HS16/src/orxonox/controllers

Timestamp:

Oct 23, 2017, 2:22:13 PM (7 years ago)

Author:

patricwi

Message:

trunk merged into hud

Location:

code/branches/HUD_HS16

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)

code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h

@@ -92 +92 @@
             //friend class, for mouselook
             friend class Map;
+            static HumanController* localController_s;
 
         protected:
-            static HumanController* localController_s;
             bool controlPaused_;