[Orxonox-commit 565] r3103 - in trunk/src: core orxonox orxonox/objects/gametypes

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-05-28 04:56:37 +0200 (Thu, 28 May 2009)
New Revision: 3103

Modified:
   trunk/src/core/Core.cc
   trunk/src/orxonox/GraphicsManager.cc
   trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc
Log:
some fixes and changes (also signalhandler)


Modified: trunk/src/core/Core.cc
===================================================================
--- trunk/src/core/Core.cc	2009-05-28 01:05:54 UTC (rev 3102)
+++ trunk/src/core/Core.cc	2009-05-28 02:56:37 UTC (rev 3103)
@@ -180,7 +180,6 @@
         delete this->luaBind_;
         delete this->languageInstance_;
         delete this->configFileManager_;
-        delete this->signalHandler_;
 
         // Destroy command line arguments
         CommandLine::destroyAllArguments();
@@ -189,6 +188,7 @@
 
         assert(Core::singletonRef_s);
         Core::singletonRef_s = 0;
+        delete this->signalHandler_;
     }
 
     /**

Modified: trunk/src/orxonox/GraphicsManager.cc
===================================================================
--- trunk/src/orxonox/GraphicsManager.cc	2009-05-28 01:05:54 UTC (rev 3102)
+++ trunk/src/orxonox/GraphicsManager.cc	2009-05-28 02:56:37 UTC (rev 3103)
@@ -141,6 +141,10 @@
                 delete this->ogreWindowEventListener_;
             }
 
+            // destroy render window
+//            Ogre::RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
+//            renderer->destroyRenderWindow("Orxonox");
+
             // unload all compositors
             Ogre::CompositorManager::getSingleton().removeAll();
 

Modified: trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc
===================================================================
--- trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc	2009-05-28 01:05:54 UTC (rev 3102)
+++ trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc	2009-05-28 02:56:37 UTC (rev 3103)
@@ -53,6 +53,8 @@
         TeamBaseMatchBase* base = dynamic_cast<TeamBaseMatchBase*>(victim);
         if (base)
         {
+            if ( !originator )
+                return false;
             std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(base);
             if (it != this->bases_.end())
             {