[Orxonox-commit 6055] r10714 - code/branches/fabienHS15/src/orxonox/weaponsystem

fvultier at orxonox.net fvultier at orxonox.net
Mon Oct 26 23:36:27 CET 2015


Author: fvultier
Date: 2015-10-26 23:36:27 +0100 (Mon, 26 Oct 2015)
New Revision: 10714

Modified:
   code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc
Log:


Modified: code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc	2015-10-26 22:34:23 UTC (rev 10713)
+++ code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc	2015-10-26 22:36:27 UTC (rev 10714)
@@ -361,33 +361,6 @@
             }
 
             return true;
-
-
-
-
-
-            /*
-            // Share the munition equally to the current magazines
-            while (amount > 0)
-            {
-                bool change = false;
-                for (std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
-                {
-                    // Add munition if the magazine isn't full (but only to loaded magazines)
-                    if (amount > 0 && it->second->munition_ < this->maxMunitionPerMagazine_ && it->second->bLoaded_)
-                    {
-                        it->second->munition_++;
-                        amount--;
-                        change = true;
-                    }
-                }
-
-                // If there was no change in a loop, all magazines are full (or locked due to loading)
-                if (!change)
-                    break;
-            }
-
-            return true;*/
         }
     }
 




More information about the Orxonox-commit mailing list