[Orxonox-commit 5756] r10416 - code/branches/core7/src/orxonox

[landauf at orxonox.net]

Author: landauf
Date: 2015-05-03 12:22:22 +0200 (Sun, 03 May 2015)
New Revision: 10416

Modified:
   code/branches/core7/src/orxonox/PawnManager.cc
   code/branches/core7/src/orxonox/PawnManager.h
   code/branches/core7/src/orxonox/ShipPartManager.cc
   code/branches/core7/src/orxonox/ShipPartManager.h
Log:
i think it makes more sense to delete killed pawns and shipparts directly after a tick instead of before the next tick

Modified: code/branches/core7/src/orxonox/PawnManager.cc
===================================================================
--- code/branches/core7/src/orxonox/PawnManager.cc	2015-05-03 10:19:49 UTC (rev 10415)
+++ code/branches/core7/src/orxonox/PawnManager.cc	2015-05-03 10:22:22 UTC (rev 10416)
@@ -50,7 +50,7 @@
             (it++)->destroy();
     }
 
-    void PawnManager::preUpdate(const Clock& time)
+    void PawnManager::postUpdate(const Clock& time)
     {
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); )
         {

Modified: code/branches/core7/src/orxonox/PawnManager.h
===================================================================
--- code/branches/core7/src/orxonox/PawnManager.h	2015-05-03 10:19:49 UTC (rev 10415)
+++ code/branches/core7/src/orxonox/PawnManager.h	2015-05-03 10:22:22 UTC (rev 10416)
@@ -43,8 +43,8 @@
             PawnManager();
             virtual ~PawnManager();
 
-            virtual void preUpdate(const Clock& time);
-            virtual void postUpdate(const Clock& time) { /*no action*/ }
+            virtual void preUpdate(const Clock& time) { /*no action*/ }
+            virtual void postUpdate(const Clock& time);
 
         private:
 

Modified: code/branches/core7/src/orxonox/ShipPartManager.cc
===================================================================
--- code/branches/core7/src/orxonox/ShipPartManager.cc	2015-05-03 10:19:49 UTC (rev 10415)
+++ code/branches/core7/src/orxonox/ShipPartManager.cc	2015-05-03 10:22:22 UTC (rev 10416)
@@ -50,7 +50,7 @@
             (it++)->destroy();
     }
 
-    void ShipPartManager::preUpdate(const Clock& time)
+    void ShipPartManager::postUpdate(const Clock& time)
     {
         for (ObjectList<ShipPart>::iterator it = ObjectList<ShipPart>::begin(); it != ObjectList<ShipPart>::end(); )
         {

Modified: code/branches/core7/src/orxonox/ShipPartManager.h
===================================================================
--- code/branches/core7/src/orxonox/ShipPartManager.h	2015-05-03 10:19:49 UTC (rev 10415)
+++ code/branches/core7/src/orxonox/ShipPartManager.h	2015-05-03 10:22:22 UTC (rev 10416)
@@ -43,8 +43,8 @@
             ShipPartManager();
             virtual ~ShipPartManager();
 
-            virtual void preUpdate(const Clock& time);
-            virtual void postUpdate(const Clock& time) { /*no action*/ }
+            virtual void preUpdate(const Clock& time) { /*no action*/ }
+            virtual void postUpdate(const Clock& time);
 
         private: