summaryrefslogtreecommitdiffstats
path: root/src/object/object.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-08-10 23:31:42 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-08-10 23:31:42 +0200
commit63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34 (patch)
treeaa1fcf2928e2c9d5f89022242fbe3ff6d7d64bbb /src/object/object.h
parentc3ab23ac9dc02d59180f2f1af5f3aa5b50f9f8d8 (diff)
downloadcolobot-63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34.tar.gz
colobot-63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34.tar.bz2
colobot-63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34.zip
Partial CEngine implementation
- added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine
Diffstat (limited to 'src/object/object.h')
-rw-r--r--src/object/object.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/object/object.h b/src/object/object.h
index 3825412..4a4dcb0 100644
--- a/src/object/object.h
+++ b/src/object/object.h
@@ -25,10 +25,6 @@
class CInstanceManager;
-class CLight;
-class CTerrain;
-class CWater;
-class CParticule;
class CPhysics;
class CBrain;
class CMotion;
@@ -40,6 +36,7 @@ class CScript;
+
// The father of all parts must always be the part number zero!
const int OBJECTMAXPART = 40;
@@ -306,7 +303,7 @@ enum ObjectMaterial
struct ObjectPart
{
char bUsed;
- int object; // number of the object in CD3DEngine
+ int object; // number of the object in CEngine
int parentPart; // number of father part
int masterParti; // master canal of the particle
Math::Vector position;
@@ -677,7 +674,7 @@ protected:
CAuto* m_auto;
CDisplayText* m_displayText;
CRobotMain* m_main;
- CSound* m_sound;
+ CSoundInterface* m_sound;
CBotVar* m_botVar;
CScript* m_runScript;