[Orxonox-commit 7057] r11676 - in code/branches/CampaignMap_HS17: data/levels data/overlays src/modules/overlays/hud

[fanconic at orxonox.net]

Author: fanconic
Date: 2017-12-15 12:36:35 +0100 (Fri, 15 Dec 2017)
New Revision: 11676

Modified:
   code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
   code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo
   code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
Log:
resolved segfault by simply not deleting the newly created textoverlay elements on our own in the destructor of the storymodehud, because they are deleted 'automatically' when the game is quit

Modified: code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw	2017-12-15 11:07:58 UTC (rev 11675)
+++ code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw	2017-12-15 11:36:35 UTC (rev 11676)
@@ -29,7 +29,7 @@
 
   <SpawnPoint position="000.000, 000.000, 000.000" spawnclass=StoryModePawn orientation="0, 0, 0, 1" pawndesign=StoryModeEscort /> 
 
- <NameableStaticEntity levelName="Level 1" position="0,0,-500" direction="1,0,0">
+ <NameableStaticEntity levelName="Level 1" position="0,0,-500" direction="0,1,0">
   <attached>
     <Model position="0,0,0" mesh="ETH.mesh" scale=80 />
   </attached>

Modified: code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo
===================================================================
--- code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo	2017-12-15 11:07:58 UTC (rev 11675)
+++ code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo	2017-12-15 11:36:35 UTC (rev 11676)
@@ -5,7 +5,7 @@
      name           = "StoryMode"
      correctaspect  = false
      font           = "VeraMono"
-     textSize       = 0.05
+     textSize       = 0.0420
      align          = "center"
     />
 

Modified: code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc	2017-12-15 11:07:58 UTC (rev 11675)
+++ code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc	2017-12-15 11:36:35 UTC (rev 11676)
@@ -69,10 +69,7 @@
 
     // Destructor of the StoryMode HUD
     StoryModeHUD::~StoryModeHUD()
-    {
-        for(Ogre::TextAreaOverlayElement* text : texts)
-          delete text;
-    }
+    {}
 
     // Functions of the StoryMode HUD