Changeset 7072 for code/branches/presentation3/src/orxonox

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/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• infos/PlayerInfo.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/CMakeLists.txt

@@ -62 +62 @@
     controllers/HumanController.h
     interfaces/Pickupable.h
+    infos/PlayerInfo.h
     sound/SoundManager.h
   DEFINE_SYMBOL

code/branches/presentation3/src/orxonox/infos/PlayerInfo.h

@@ -35 +35 @@
 #include "core/SubclassIdentifier.h"
 
-namespace orxonox
-{
-    class _OrxonoxExport PlayerInfo : public Info
-    {
+namespace orxonox // tolua_export
+{ // tolua_export
+    class _OrxonoxExport PlayerInfo // tolua_export
+        : public Info
+    { // tolua_export
         public:
             PlayerInfo(BaseObject* creator);
@@ -103 +104 @@
             const GametypeInfo* gtinfo_;
             unsigned int gtinfoID_;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _PlayerInfo_H__ */