Changeset 7072 for code/branches/presentation3/data/levels

Timestamp:

Jun 1, 2010, 9:28:28 PM (14 years ago)

Author:

dafrick

Message:

Made the QuestGUI completely lua based in an attempt to remove a segfault that occured when closing orxonox. Successfully, I might add.
In the process of doing so I expanded the GUITools by adding a function that calculates the height that text in an input window needs, with word-wrap enabled.
Also fixed a small error in the Quest_PirateAttack level.

Location:

code/branches/presentation3/data/levels

Files:

• Quest_PirateAttack.oxw (modified) (1 diff)
• pickups.oxw (modified) (1 diff)

code/branches/presentation3/data/levels/Quest_PirateAttack.oxw

@@ -158 +158 @@
                                         <attached>
                                                 <Billboard position="0,0,0" scale=3 colour="1.0,1.0,0" material="Examples/Flare" />
-                                                <DistanceTrigger name=questbeacon2  targetname=Me position="0,0,0" distance=400 target="Pawn" />
+                                                <DistanceTrigger name=questbeacon2 targetname=Me position="0,0,0" target=DistanceTriggerBeacon distance=400 />
                                         </attached>
                                         <effects>

code/branches/presentation3/data/levels/pickups.oxw

@@ -6 +6 @@
 <?lua
   include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
   include("templates/pickup_representation_templates.oxt")
   include("templates/lodinformation.oxt")