Index: code/branches/cpp11_v3/src/orxonox/weaponsystem/Weapon.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/Weapon.h	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/Weapon.h	(revision 11059)
@@ -57,6 +57,6 @@
             void addWeaponmode(WeaponMode* weaponmode);
             WeaponMode* getWeaponmode(unsigned int index) const;
-            inline std::multimap<unsigned int, WeaponMode*>* getAllWeaponmodes()
-                { return &weaponmodes_; }
+            inline const std::multimap<unsigned int, WeaponMode*>& getAllWeaponmodes() const
+                { return weaponmodes_; }
             inline int getNumWeaponModes() const
                 { return weaponmodes_.size(); }
Index: code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc	(revision 11059)
@@ -124,9 +124,4 @@
     }
 
-    std::vector<Weapon*>* WeaponPack::getAllWeapons()
-    {
-        return &weapons_;        
-    }    
-
     void WeaponPack::addDefaultWeaponmodeLink(DefaultWeaponmodeLink* link)
     {
Index: code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.h	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.h	(revision 11059)
@@ -52,5 +52,6 @@
             void removeWeapon(Weapon * weapon);
             Weapon * getWeapon(unsigned int index) const;
-            std::vector<Weapon*>* getAllWeapons();
+            inline const std::vector<Weapon*>& getAllWeapons() const
+                { return weapons_; }
 
             inline size_t getNumWeapons() const
Index: code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc	(revision 11059)
@@ -240,9 +240,4 @@
     }
 
-    std::vector<WeaponPack *> * WeaponSystem::getAllWeaponPacks()
-    {
-        return &weaponPacks_;
-    }    
-
     bool WeaponSystem::swapWeaponSlots(WeaponSlot * wSlot1, WeaponSlot * wSlot2)
     {
Index: code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.h	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.h	(revision 11059)
@@ -67,5 +67,6 @@
             void removeWeaponPack(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
-            std::vector<WeaponPack *> * getAllWeaponPacks();
+            inline const std::vector<WeaponPack *>& getAllWeaponPacks() const
+                { return weaponPacks_; }
 
             // configure slots and firemodes
Index: code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc	(revision 11059)
@@ -513,12 +513,4 @@
     }
 
-    std::vector<WeaponPack *> * Pawn::getAllWeaponPacks()
-    {
-        if (this->weaponSystem_)
-            return this->weaponSystem_->getAllWeaponPacks();
-        else
-            return 0;        
-    }
-
     void Pawn::addMunitionXML(Munition* munition)
     {
Index: code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.h	(revision 11058)
+++ code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.h	(revision 11059)
@@ -170,5 +170,4 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
-            std::vector<WeaponPack *> * getAllWeaponPacks();
 
             void addMunitionXML(Munition* munition);
