From 0496353916f1f619a01c3195476880a150dbd29a Mon Sep 17 00:00:00 2001
From: josh <josh@bd8a9e45-a331-0410-811e-c64571078777>
Date: Fri, 9 Oct 2009 03:00:51 +0000
Subject: [PATCH] fixed bug to initialize m_body to 0 in OdeWorld::Object

git-svn-id: svn://anubis/misc/OdeWorld@163 bd8a9e45-a331-0410-811e-c64571078777
---
 OdeWorld.cc | 7 ++++---
 OdeWorld.h  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OdeWorld.cc b/OdeWorld.cc
index ca0a03f..8df3772 100644
--- a/OdeWorld.cc
+++ b/OdeWorld.cc
@@ -87,7 +87,7 @@ OdeWorld::Object * OdeWorld::createObject(bool is_static)
 
 /* push an OpenGL matrix onto the matrix stack for a given
  * ODE body position and rotation */
-void OdeWorld::pushTransform(const float pos[3], const float R[12])
+void OdeWorld::pushTransform(const dReal * pos, const dReal * R)
 {
     GLfloat matrix[16];
     matrix[0] = R[0];
@@ -115,6 +115,7 @@ OdeWorld::Object::Object(bool is_static, dWorldID world, dSpaceID space)
     m_is_static = is_static;
     m_world = world;
     m_space = space;
+    m_body = 0;
 }
 
 void OdeWorld::Object::setPosition(double x, double y, double z)
@@ -314,7 +315,7 @@ void OdeWorld::Object::setupGeom(dGeomID geom, dMass * mass,
 
 const dReal * OdeWorld::Object::getPosition()
 {
-    if (m_body != NULL)
+    if (m_body != 0)
     {
         return dBodyGetPosition(m_body);
     }
@@ -327,7 +328,7 @@ const dReal * OdeWorld::Object::getPosition()
 
 const dReal * OdeWorld::Object::getRotation()
 {
-    if (m_body != NULL)
+    if (m_body != 0)
     {
         return dBodyGetRotation(m_body);
     }
diff --git a/OdeWorld.h b/OdeWorld.h
index ee190d1..1a9acb3 100644
--- a/OdeWorld.h
+++ b/OdeWorld.h
@@ -54,7 +54,7 @@ class OdeWorld
         friend void OdeWorld_collide_callback(void * data,
                 dGeomID o1, dGeomID o2);
 
-        static void pushTransform(const float pos[3], const float R[12]);
+        static void pushTransform(const dReal * pos, const dReal * R);
 
     protected:
         dWorldID        m_world;