Changeset 8501 for code/branches/dockingsystem2/src/modules/docking

Timestamp:

May 18, 2011, 11:33:28 AM (14 years ago)

Author:

dafrick

Message:

Minor changes.

Location:

code/branches/dockingsystem2/src/modules/docking

Files:

• Dock.cc (modified) (1 diff)
• DockToShip.cc (modified) (2 diffs)
• DockToShip.h (modified) (1 diff)
• DockingAnimation.cc (modified) (1 diff)
• DockingController.cc (modified) (3 diffs)
• DockingEffect.cc (modified) (1 diff)
• DockingPrereqs.h (modified) (1 diff)
• DockingTarget.cc (modified) (1 diff)
• DockingTarget.h (modified) (1 diff)
• MoveToDockingTarget.cc (modified) (1 diff)

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

@@ -278 +278 @@
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockToShip.cc

@@ -58 +58 @@
     }
 
-    void DockToShip::setTargetId(std::string str) {
+    void DockToShip::setTargetId(const std::string& str) {
         this->target = str;
     }
 
-    std::string DockToShip::getTargetId() {
+    const std::string& DockToShip::getTargetId() const {
         return this->target;
     }
@@ -99 +99 @@
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockToShip.h

@@ -61 +61 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void setTargetId(std::string str);
-            std::string getTargetId();
+            void setTargetId(const std::string& str);
+            const std::string& getTargetId() const;
 
             virtual bool docking(PlayerInfo* player); //!< Called when docking starts

code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc

@@ -67 +67 @@
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockingController.cc

@@ -29 +29 @@
 #include "DockingController.h"
 
+#include "infos/PlayerInfo.h"
+#include "worldentities/ControllableEntity.h"
 #include "Dock.h"
-
 
 namespace orxonox
@@ -56 +57 @@
     {
         // TODO; Give control back to player
+        PlayerInfo* player = this->entity->getPlayer();
+        assert(player);
 
         if (docking)
@@ -63 +66 @@
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc

@@ -71 +71 @@
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h

@@ -67 +67 @@
     class Dock;
     class DockingAnimation;
+    class DockingController;
     class DockingTarget;
     class DockingEffect;

code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc

@@ -59 +59 @@
 
 
-    void DockingTarget::setName(std::string str) {
+    void DockingTarget::setName(const std::string& str) {
         this->name = str;
     }
 
-    std::string DockingTarget::getName() {
+    const std::string& DockingTarget::getName() const {
         return this->name;
     }
 }
+

code/branches/dockingsystem2/src/modules/docking/DockingTarget.h

@@ -63 +63 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            virtual void setName(std::string str);
-            virtual std::string getName();
+            virtual void setName(const std::string& str);
+            virtual const std::string& getName() const;
     };
 

code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc

@@ -65 +65 @@
 
 }
+