[Orxonox-commit 411] r2995 - in branches/netp3/src: network orxonox/objects/quest

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-05-20 16:10:02 +0200 (Wed, 20 May 2009)
New Revision: 2995

Modified:
   branches/netp3/src/network/NetworkFunction.h
   branches/netp3/src/orxonox/objects/quest/QuestManager.cc
Log:
Fixed two small build problems.

Modified: branches/netp3/src/network/NetworkFunction.h
===================================================================
--- branches/netp3/src/network/NetworkFunction.h	2009-05-20 14:01:22 UTC (rev 2994)
+++ branches/netp3/src/network/NetworkFunction.h	2009-05-20 14:10:02 UTC (rev 2995)
@@ -138,7 +138,7 @@
 };
 
 
-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);
     ~NetworkMemberFunction();

Modified: branches/netp3/src/orxonox/objects/quest/QuestManager.cc
===================================================================
--- branches/netp3/src/orxonox/objects/quest/QuestManager.cc	2009-05-20 14:01:22 UTC (rev 2994)
+++ branches/netp3/src/orxonox/objects/quest/QuestManager.cc	2009-05-20 14:10:02 UTC (rev 2995)
@@ -229,8 +229,8 @@
             COUT(1) << "Something BAD happened." << std::endl;
             return NULL;
         }
+        player = static_cast<PlayerInfo*>(gui->getOwner());
         COUT(1) << player << std::endl;
-        ConverterExplicit<BaseObject, PlayerInfo>::convert(player, *(gui->getOwner()));
     
         QuestContainer* root = NULL;
         QuestContainer* current = NULL;