Changeset 6070 in orxonox.OLD for trunk/src

Timestamp:

Dec 12, 2005, 6:13:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: suppression file and minor fixes

Location:

trunk/src

Files:

• lib/coord/null_parent.cc (modified) (1 diff)
• lib/coord/p_node.h (modified) (2 diffs)
• lib/lang/class_list.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

trunk/src/lib/coord/null_parent.cc

@@ -33 +33 @@
   this->setName("NullParent");
 
+  while (!this->getNodesChildren().empty())
+    delete this->getNodesChildren().front();
+
   this->setParentMode(PNODE_ALL);
   NullParent::singletonRef = this;

trunk/src/lib/coord/p_node.h

@@ -71 +71 @@
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
 class PNode : virtual public BaseObject {
-
  public:
   PNode ();
@@ -137 +136 @@
   void removeChild (PNode* child);
   void removeNode();
+  const std::list<PNode*>& getNodesChildren() const { return this->children; };
 
   /** @param parent the new parent of this node */

trunk/src/lib/lang/class_list.h

@@ -59 +59 @@
 
   private:
+
     static ClassList*                     getClassList(ClassID classID);
     static ClassList*                     getClassList(const char* className);

trunk/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 
-#ifndef AL_VERSION_1_1
+#ifdef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(false);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;