1 files changed, 36 insertions, 9 deletions

diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h
index 36ba075eeff..116eed12cea 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h
+++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h
@@ -1,3 +1,34 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
 #ifndef SM_FHOBJECT_H
 #define SM_FHOBJECT_H
 
@@ -5,19 +36,15 @@
 
 class SM_FhObject : public SM_Object {
 public:
-	SM_FhObject() {}
-	SM_FhObject(const MT_Vector3& ray, SM_Object *client_object) :
-		SM_Object(DT_Ray(ray[0], ray[1], ray[2]), 0, 0, 0),
-		m_ray(ray),
-		m_ray_direction(ray.normalized()),
-		m_client_object(client_object) {}
+	virtual ~SM_FhObject();
+	SM_FhObject(DT_ShapeHandle rayshape, MT_Vector3 ray, SM_Object *parent_object);
 
 	const MT_Vector3&  getRay()          const { return m_ray; }
 	MT_Point3          getSpot()         const { return m_pos + m_ray; }
 	const MT_Vector3&  getRayDirection() const { return m_ray_direction; }
-	SM_Object         *getClientObject() const { return m_client_object; }
+	SM_Object         *getParentObject() const { return m_parent_object; }
 
-	static void ray_hit(void *client_data,  
+	static DT_Bool ray_hit(void *client_data,  
 		void *object1,
 		void *object2,
 		const DT_CollData *coll_data);
@@ -25,7 +52,7 @@ public:
 private:
 	MT_Vector3      m_ray;
 	MT_Vector3      m_ray_direction;
-	SM_Object      *m_client_object;
+	SM_Object      *m_parent_object;
 };
 
 #endif