[Orxonox-commit 2230] r6946 - code/branches/presentation3/data/levels

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-20 22:46:15 +0200 (Thu, 20 May 2010)
New Revision: 6946

Modified:
   code/branches/presentation3/data/levels/princessaeryn.oxw
   code/branches/presentation3/data/levels/questsystem2.oxw
Log:
Small thing that I forgot (and probably should mention as well). NotificationQueues need (from now on) to be in the <Level></Level> brackets. The reason is that thed need to be destroyed when the Level is destroyed for the NotificationListeners and the Notifications to be properly unregistered and destroyed.


Modified: code/branches/presentation3/data/levels/princessaeryn.oxw
===================================================================
--- code/branches/presentation3/data/levels/princessaeryn.oxw	2010-05-20 20:36:48 UTC (rev 6945)
+++ code/branches/presentation3/data/levels/princessaeryn.oxw	2010-05-20 20:46:15 UTC (rev 6946)
@@ -8,19 +8,20 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
 
-<NotificationQueue
- name     = "notification"
- position = "0.55, 0.05"
- font     = "VeraMono"
- textsize = 0.020
- length   = 3
- width    = 50
-/>
-
 <Level
  name         = "The Tale of Princess Aeryn"
  description  = "The Tale of Princess Aeryn"
 >
+
+    <NotificationQueue
+     name     = "notification"
+     position = "0.55, 0.05"
+     font     = "VeraMono"
+     textsize = 0.020
+     length   = 3
+     width    = 50
+    />
+
     <Scene
         ambientlight = "0.3, 0.3, 0.3"
         skybox       = "Orxonox/skypanoramagen1"

Modified: code/branches/presentation3/data/levels/questsystem2.oxw
===================================================================
--- code/branches/presentation3/data/levels/questsystem2.oxw	2010-05-20 20:36:48 UTC (rev 6945)
+++ code/branches/presentation3/data/levels/questsystem2.oxw	2010-05-20 20:46:15 UTC (rev 6946)
@@ -4,20 +4,21 @@
   include("templates/spaceship_assff.oxt")
 ?>
 
-<NotificationQueue
- name     = "notification"
- position = "0.55, 0.05"
- font     = "VeraMono"
- textsize = 0.020
- length   = 3
- width    = 50
-/>
-
 <Level
  name         = "QuestSystem2"
  description  = "Test level for Questsystem-Features"
 
 >
+
+  <NotificationQueue
+     name     = "notification"
+     position = "0.55, 0.05"
+     font     = "VeraMono"
+     textsize = 0.020
+     length   = 3
+     width    = 50
+    />
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
    skybox       = "Orxonox/skypanoramagen1"