Changeset 9667 for code/trunk/src/orxonox/infos/PlayerInfo.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/infos/PlayerInfo.h (modified) (2 diffs)

code/trunk/src/orxonox/infos/PlayerInfo.h

@@ -33 +33 @@
 
 #include "Info.h"
-#include "core/SubclassIdentifier.h"
+#include "core/class/SubclassIdentifier.h"
 
 namespace orxonox // tolua_export
@@ -41 +41 @@
     { // tolua_export
         public:
-            PlayerInfo(BaseObject* creator);
+            PlayerInfo(Context* context);
             virtual ~PlayerInfo();