Changeset 9869 in orxonox.OLD for trunk/src/lib/shell/shell.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/shell/shell.h (modified) (3 diffs)

trunk/src/lib/shell/shell.h

@@ -14 +14 @@
 
 #include "shell_input.h"
-#include "shell_buffer.h"
+#include "debug_buffer.h"
 #include "material.h"
 
@@ -48 +48 @@
   class Shell : public Element2D, public EventListener
   {
-
+    ObjectListDeclaration(Shell);
   public:
     Shell();
@@ -93 +93 @@
   private:
     // GENERAL
-    ShellBuffer*                shellBuffer;            //!< The local ShellBuffer.
+    DebugBuffer*                shellBuffer;            //!< The local ShellBuffer.
 
     bool                        bActive;                //!< If the shell is active.