Changeset 11054 for code/branches/cpp11_v3/src/orxonox/controllers/ScriptController.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

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

code/branches/cpp11_v3/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