Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

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

code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h

@@ -49 +49 @@
             virtual void changedGametype();
 
-            virtual void changedController() {}
-            virtual void changedControllableEntity() {}
-
             inline bool isHumanPlayer() const
                 { return this->bHumanPlayer_; }
@@ -76 +73 @@
             inline Controller* getController() const
                 { return this->controller_; }
+            virtual void changedController() {}
 
         protected: