diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-08 20:30:57 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-08 20:30:57 +0200 |
| commit | d6525b5661c364a46514aaa772c090ecb0bfd26c (patch) | |
| tree | 5cb6c868fef7e5b11c7e87f35606f30fc50be684 /src/object/motion | |
| parent | 6d754dc45e14d4b56998a8266b764dd02d9ada51 (diff) | |
| download | colobot-d6525b5661c364a46514aaa772c090ecb0bfd26c.tar.gz colobot-d6525b5661c364a46514aaa772c090ecb0bfd26c.tar.bz2 colobot-d6525b5661c364a46514aaa772c090ecb0bfd26c.zip | |
Changes from master
Diffstat (limited to 'src/object/motion')
| -rw-r--r-- | src/object/motion/motionant.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionbee.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionhuman.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionmother.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionspider.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motiontoto.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionvehicle.cpp | 2 | ||||
| -rw-r--r-- | src/object/motion/motionworm.cpp | 2 |
8 files changed, 0 insertions, 16 deletions
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index 3790f7e..3273f76 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -53,8 +53,6 @@ CMotionAnt::CMotionAnt(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_armMember = START_TIME;
m_armTimeAbs = START_TIME;
m_armTimeMarch = START_TIME;
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index 65ebeb7..1325a11 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -53,8 +53,6 @@ CMotionBee::CMotionBee(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_armMember = START_TIME;
m_armTimeAbs = START_TIME;
m_armTimeMarch = START_TIME;
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index 78750fa..de1981e 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -57,8 +57,6 @@ CMotionHuman::CMotionHuman(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_partiReactor = -1;
m_armMember = START_TIME;
m_armTimeAbs = START_TIME;
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index 872ef76..697521f 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -53,8 +53,6 @@ CMotionMother::CMotionMother(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_armMember = START_TIME;
m_armTimeAbs = START_TIME;
m_armTimeMarch = START_TIME;
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 99c3d06..e35b4b3 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -53,8 +53,6 @@ CMotionSpider::CMotionSpider(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_armMember = START_TIME;
m_armTimeAbs = START_TIME;
m_armTimeMarch = START_TIME;
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index afd5779..c61980a 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -53,8 +53,6 @@ CMotionToto::CMotionToto(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_time = 0.0f;
m_bDisplayInfo = FALSE;
m_bQuickPos = FALSE;
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 73dae74..68a0f3e 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -56,8 +56,6 @@ CMotionVehicle::CMotionVehicle(CInstanceManager* iMan, CObject* object) {
int i;
- CMotion::CMotion(iMan, object);
-
for ( i=0 ; i<4 ; i++ )
{
m_wheelTurn[i] = 0.0f;
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index eb32b44..5da2b2c 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -55,8 +55,6 @@ CMotionWorm::CMotionWorm(CInstanceManager* iMan, CObject* object)
: CMotion(iMan, object)
{
- CMotion::CMotion(iMan, object);
-
m_timeUp = 18.0f;
m_timeDown = 18.0f;
m_armMember = START_TIME;
|