[Orxonox-commit 3102] r7796 - in code/branches/presentation2: data/gui/layouts src/modules/overlays/hud src/modules/pickup

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-12-22 10:37:18 +0100 (Wed, 22 Dec 2010)
New Revision: 7796

Modified:
   code/branches/presentation2/data/gui/layouts/InGameMenu.layout
   code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/presentation2/src/modules/pickup/PickupSpawner.cc
Log:
Making PickupSpawner more secure. Small gui adjustment.


Modified: code/branches/presentation2/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InGameMenu.layout	2010-12-22 09:36:39 UTC (rev 7795)
+++ code/branches/presentation2/data/gui/layouts/InGameMenu.layout	2010-12-22 09:37:18 UTC (rev 7796)
@@ -9,28 +9,28 @@
             <Property Name="Text" Value="Return to Game" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
-            <Property Name="Alpha" Value="0.7" />
+            <Property Name="Alpha" Value="0.9" />
             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
         </Window>
         <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
             <Property Name="Text" Value="Main Menu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
-            <Property Name="Alpha" Value="0.7" />
+            <Property Name="Alpha" Value="0.9" />
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
         </Window>
         <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
-            <Property Name="Alpha" Value="0.7" />
+            <Property Name="Alpha" Value="0.9" />
             <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
         </Window>
         <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
             <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Property Name="Alpha" Value="0.7" />
+            <Property Name="Alpha" Value="0.9" />
             <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
         </Window>
     </Window>

Modified: code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc	2010-12-22 09:36:39 UTC (rev 7795)
+++ code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc	2010-12-22 09:37:18 UTC (rev 7796)
@@ -410,4 +410,5 @@
             this->addObject ( *it );
     }
 }
+
 }

Modified: code/branches/presentation2/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/presentation2/src/modules/pickup/PickupSpawner.cc	2010-12-22 09:36:39 UTC (rev 7795)
+++ code/branches/presentation2/src/modules/pickup/PickupSpawner.cc	2010-12-22 09:37:18 UTC (rev 7796)
@@ -119,7 +119,7 @@
     */
     PickupSpawner::~PickupSpawner()
     {
-        if(this->selfDestruct_ && this->pickup_ != NULL)
+        if(this->isInitialized() && this->selfDestruct_ && this->pickup_ != NULL)
             this->pickup_->destroy();
     }