Context Navigation

Changeset 8501

Timestamp:

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

Author:

dafrick

Message:

Minor changes.

Location:

code/branches/dockingsystem2

Files:

r8500	r8501
14	14
15	15	P:setButton(1, 2, {
16		["button"] = winMgr:getWindow("orxonox/DockingCancelButto"),
	16	["button"] = winMgr:getWindow("orxonox/DockingCancelButton"),
17	17	["callback"] = P.cancelButton_clicked
18	18	})

r8493	r8501
58	58	}
59	59
60		void DockToShip::setTargetId(~~std::string~~ str) {
	60	void DockToShip::setTargetId(const std::string& str) {
61	61	this->target = str;
62	62	}
63	63
64		~~std::string DockToShip::getTargetId()~~ {
	64	const std::string& DockToShip::getTargetId() const {
65	65	return this->target;
66	66	}
…	…
99	99	}
100	100	}
	101

-                      r8493
+                      r8501
             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

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

r8257	r8501
59	59
60	60
61		void DockingTarget::setName(~~std::string~~ str) {
	61	void DockingTarget::setName(const std::string& str) {
62	62	this->name = str;
63	63	}
64	64
65		~~std::string DockingTarget::getName()~~ {
	65	const std::string& DockingTarget::getName() const {
66	66	return this->name;
67	67	}
68	68	}
	69

-                      r8257
+                      r8501
             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;
     };

-                      r8493
+                      r8501
+    }
-    void ArtificialController::positionReached()
+    {
-        // Override me !
+    }
     /**
         @brief Unregisters a slave from its master. Initiated by a slave.

r8493	r8501
97	97	void moveToTargetPosition();
98	98
99		virtual void positionReached();
	99	virtual void positionReached() {}
100	100
101	101	void removeFromFormation();

Note: See TracChangeset for help on using the changeset viewer.