Changeset 11071 for code/trunk/src/orxonox/controllers/ScriptController.h

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

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

code/trunk/src/orxonox/controllers/ScriptController.h

@@ -71 +71 @@
             void setPlayer(PlayerInfo* player) { this->player_ = player; }
            
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // LUA interface