From 45302a3f4e1fa535f42c6a9e9d1aa71a1ac2db71 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 12 Jul 2015 13:32:50 +0200
Subject: [PATCH] Make CPhysics and CBrain use COldObject

---
 src/object/brain.cpp    |  3 ++-
 src/object/brain.h      |  6 +++---
 src/physics/physics.cpp | 12 +++---------
 src/physics/physics.h   |  5 +++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index f4e8d578..17b65366 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -27,6 +27,7 @@
 #include "graphics/core/color.h"
 #include "graphics/engine/terrain.h"
 
+#include "object/old_object.h"
 #include "object/object_manager.h"
 #include "object/motion/motion.h"
 #include "object/motion/motionvehicle.h"
@@ -55,7 +56,7 @@ const int MAXTRACERECORD = 1000;
 
 // Object's constructor.
 
-CBrain::CBrain(CObject* object)
+CBrain::CBrain(COldObject* object)
 {
     m_object      = object;
     m_engine      = Gfx::CEngine::GetInstancePointer();
diff --git a/src/object/brain.h b/src/object/brain.h
index 0f0b24c3..d9453308 100644
--- a/src/object/brain.h
+++ b/src/object/brain.h
@@ -34,7 +34,7 @@
 #include "object/task/taskshield.h"
 
 
-class CObject;
+class COldObject;
 class CPhysics;
 class CMotion;
 class CTaskManager;
@@ -87,7 +87,7 @@ struct Program
 class CBrain
 {
 public:
-    CBrain(CObject* object);
+    CBrain(COldObject* object);
     ~CBrain();
 
     void        DeleteObject(bool bAll=false);
@@ -190,7 +190,7 @@ protected:
     Gfx::CWater*        m_water;
     Gfx::CCamera*       m_camera;
     Gfx::CParticle*     m_particle;
-    CObject*            m_object;
+    COldObject*         m_object;
     CPhysics*           m_physics;
     CMotion*            m_motion;
     Ui::CInterface*     m_interface;
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 555f9785..7c615563 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -43,16 +43,13 @@
 #include "object/task/task.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
+#include "object/old_object.h"
 #include "object/interface/carrier_object.h"
 #include "object/interface/jostleable_object.h"
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
 
-#include <cstring>
-#include <cstdio>
-
-
 
 const float LANDING_SPEED   = 3.0f;
 const float LANDING_ACCEL   = 5.0f;
@@ -63,7 +60,7 @@ const float LANDING_ACCELh  = 1.5f;
 
 // Object's constructor.
 
-CPhysics::CPhysics(CObject* object)
+CPhysics::CPhysics(COldObject* object)
 {
     m_object    = object;
     m_engine    = Gfx::CEngine::GetInstancePointer();
@@ -119,16 +116,13 @@ CPhysics::CPhysics(CObject* object)
     m_fallingHeight = 0.0f;
     m_minFallingHeight = 20.0f;
     m_fallDamageFraction = 0.007f;
-
-    memset(&m_linMotion, 0, sizeof(Motion));
-    memset(&m_cirMotion, 0,sizeof(Motion));
 }
 
 // Object's destructor.
 
 CPhysics::~CPhysics()
 {
-    }
+}
 
 
 // Destroys the object.
diff --git a/src/physics/physics.h b/src/physics/physics.h
index 87c0fa2c..39811ca7 100644
--- a/src/physics/physics.h
+++ b/src/physics/physics.h
@@ -33,6 +33,7 @@
 
 
 class CObject;
+class COldObject;
 class CBrain;
 class CMotion;
 class CSoundInterface;
@@ -99,7 +100,7 @@ struct Motion
 class CPhysics
 {
 public:
-    CPhysics(CObject* object);
+    CPhysics(COldObject* object);
     ~CPhysics();
 
     void        DeleteObject(bool bAll=false);
@@ -212,7 +213,7 @@ protected:
     Gfx::CTerrain*      m_terrain;
     Gfx::CWater*        m_water;
     Gfx::CCamera*       m_camera;
-    CObject*            m_object;
+    COldObject*         m_object;
     CBrain*             m_brain;
     CMotion*            m_motion;
     CSoundInterface*    m_sound;