Changeset 2995 for code/branches

Timestamp:

May 20, 2009, 4:10:02 PM (16 years ago)

Author:

rgrieder

Message:

Fixed two small build problems.

Location:

code/branches/netp3/src

Files:

• network/NetworkFunction.h (modified) (1 diff)
• orxonox/objects/quest/QuestManager.cc (modified) (1 diff)

code/branches/netp3/src/network/NetworkFunction.h

@@ -139 +139 @@
 
 
-template <class T> class _NetworkExport NetworkMemberFunction: public NetworkMemberFunctionBase {
+template <class T> class NetworkMemberFunction: public NetworkMemberFunctionBase {
   public:
     NetworkMemberFunction(FunctorMember<T>* functor, std::string name, const NetworkFunctionPointer& p);

code/branches/netp3/src/orxonox/objects/quest/QuestManager.cc

@@ -230 +230 @@
             return NULL;
         }
+        player = static_cast<PlayerInfo*>(gui->getOwner());
         COUT(1) << player << std::endl;
-        ConverterExplicit<BaseObject, PlayerInfo>::convert(player, *(gui->getOwner()));
     
         QuestContainer* root = NULL;