Changeset 6894 in orxonox.OLD for branches/cdmerge/src/lib/collision_detection/collision.cc

Timestamp:

Jan 31, 2006, 2:41:28 PM (19 years ago)

Author:

patrick

Message:

cdmerge: merged with the newest trunk an corrected some segfaults

File:

• branches/cdmerge/src/lib/collision_detection/collision.cc (modified) (4 diffs)

branches/cdmerge/src/lib/collision_detection/collision.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
 
 #include "collision.h"
@@ -24 +24 @@
  *  standard constructor
 */
-Collision::Collision () 
+Collision::Collision ()
 {
-   this->setClassID(CL_COLLISION, "Collision"); 
+   this->setClassID(CL_COLLISION, "Collision");
 
 }
@@ -35 +35 @@
 
 */
-Collision::~Collision () 
+Collision::~Collision ()
 {
   // delete what has to be deleted here