Changeset 8192 for code/branches

Timestamp:

Apr 4, 2011, 4:53:58 PM (14 years ago)

Author:

sven

Message:

 

Location:

code/branches/dockingsystem

Files:

• data/levels/docking.oxw (modified) (2 diffs)
• src/modules/docking/Dock.cc (modified) (5 diffs)

code/branches/dockingsystem/data/levels/docking.oxw

@@ -48 +48 @@
 
 
-    <!-- 
+    
     <Destroyer
       position          = "100,150,0"
@@ -147 +147 @@
       </collisionShapes>
     </Destroyer>
-    //-->
+    
 
   </Scene>

code/branches/dockingsystem/src/modules/docking/Dock.cc

@@ -33 +33 @@
 
 #include "Dock.h"
+#include "infos/HumanPlayer.h"
 #include "worldentities/pawns/Pawn.h"
 #include "interfaces/PlayerTrigger.h"
@@ -72 +73 @@
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
     {
-        COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << std::endl;
-
-        //TODO: Handle MultiDistanceTrigger
+        //TODO: Handle DistanceMultiTrigger
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
@@ -83 +82 @@
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
-                COUT(0) << "Docking:execute PlayerTrigger is not triggered for player.." << std::endl;
+                COUT(0) << "Docking:execute PlayerTrigger was not triggered by a player.." << std::endl;
                 return false;
             }
@@ -93 +92 @@
         if(pawn == NULL)
         {
-            COUT(0) << "Docking: Can't retrieve Pawn from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+            COUT(0) << "Docking::execute Can't retrieve Pawn from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
             return false;
         }
@@ -106 +105 @@
 
         // Try to get HumanPlayer
-        HumanPlayer* human;
-        if(!player->isHuman()) {
+        if(!player->isHumanPlayer()) {
             COUT(0) << "Docking::execute Not triggered by a human." << std::endl;
             return false;
         }
-        human = orxonox_cast<HumanPlayer*>(player);
-        assert(human);
-
-
+        HumanPlayer* human = orxonox_cast<HumanPlayer*>(player);
+        if(human == NULL) {
+            COUT(0) << "Docking::execute Player was not as human as expected.." << std::endl;
+        }
+        COUT(0) << "Dock triggered by player: " << human->getNick() << ".." << std::endl;
 
         //TODO: This is waaay too oversimplified
         if(bTriggered) {
             DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
-            DockingEffect::invokeEffect(docking::ATTACH, player, effects_);
+            //DockingEffect::invokeEffect(docking::ATTACH, player, effects_);
         } else {
             DockingEffect::invokeEffect(docking::RELEASE, player, effects_);