From d6525b5661c364a46514aaa772c090ecb0bfd26c Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Fri, 8 Jun 2012 20:30:57 +0200
Subject: Changes from master

---
 src/object/auto/autobase.cpp        | 2 --
 src/object/auto/autoconvert.cpp     | 2 --
 src/object/auto/autoderrick.cpp     | 2 --
 src/object/auto/autodestroyer.cpp   | 2 --
 src/object/auto/autoegg.cpp         | 2 --
 src/object/auto/autoenergy.cpp      | 2 --
 src/object/auto/autofactory.cpp     | 2 --
 src/object/auto/autoflag.cpp        | 2 --
 src/object/auto/autohuston.cpp      | 2 --
 src/object/auto/autoinfo.cpp        | 2 --
 src/object/auto/autojostle.cpp      | 2 --
 src/object/auto/autokid.cpp         | 2 --
 src/object/auto/autolabo.cpp        | 2 --
 src/object/auto/automush.cpp        | 2 --
 src/object/auto/autonest.cpp        | 2 --
 src/object/auto/autonuclear.cpp     | 2 --
 src/object/auto/autopara.cpp        | 2 --
 src/object/auto/autoportico.cpp     | 2 --
 src/object/auto/autoradar.cpp       | 2 --
 src/object/auto/autorepair.cpp      | 2 --
 src/object/auto/autoresearch.cpp    | 2 --
 src/object/auto/autoroot.cpp        | 2 --
 src/object/auto/autosafe.cpp        | 2 --
 src/object/auto/autostation.cpp     | 2 --
 src/object/auto/autotower.cpp       | 2 --
 src/object/motion/motionant.cpp     | 2 --
 src/object/motion/motionbee.cpp     | 2 --
 src/object/motion/motionhuman.cpp   | 2 --
 src/object/motion/motionmother.cpp  | 2 --
 src/object/motion/motionspider.cpp  | 2 --
 src/object/motion/motiontoto.cpp    | 2 --
 src/object/motion/motionvehicle.cpp | 2 --
 src/object/motion/motionworm.cpp    | 2 --
 src/ui/mainmap.cpp                  | 2 +-
 34 files changed, 1 insertion(+), 67 deletions(-)

(limited to 'src')

diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index fada8d5..ca29fd2 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -65,8 +65,6 @@
 CAutoBase::CAutoBase(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_fogStart = m_engine->RetFogStart();
 	m_deepView = m_engine->RetDeepView();
 	Init();
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp
index ae213e3..c1fa75c 100644
--- a/src/object/auto/autoconvert.cpp
+++ b/src/object/auto/autoconvert.cpp
@@ -50,8 +50,6 @@
 CAutoConvert::CAutoConvert(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = ACP_STOP;
 	m_bResetDelete = FALSE;
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index d2541c5..bea3c06 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -54,8 +54,6 @@
 CAutoDerrick::CAutoDerrick(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = ADP_WAIT;  // paused until the first Init ()
 	m_soundChannel = -1;
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index 11dc0ba..417fea2 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -52,8 +52,6 @@
 CAutoDestroyer::CAutoDestroyer(CInstanceManager* iMan, CObject* object)
 						 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = ADEP_WAIT;  // paused until the first Init ()
 }
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp
index 6e57fcc..81e555d 100644
--- a/src/object/auto/autoegg.cpp
+++ b/src/object/auto/autoegg.cpp
@@ -44,8 +44,6 @@
 CAutoEgg::CAutoEgg(CInstanceManager* iMan, CObject* object)
 				   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_type = OBJECT_NULL;
 	m_value = 0.0f;
 	m_string[0] = 0;
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp
index 023a185..2b25cdf 100644
--- a/src/object/auto/autoenergy.cpp
+++ b/src/object/auto/autoenergy.cpp
@@ -56,8 +56,6 @@
 CAutoEnergy::CAutoEnergy(CInstanceManager* iMan, CObject* object)
 						 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_partiSphere = -1;
 	Init();
 }
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp
index 7fab2fb..bc3788c 100644
--- a/src/object/auto/autofactory.cpp
+++ b/src/object/auto/autofactory.cpp
@@ -55,8 +55,6 @@
 CAutoFactory::CAutoFactory(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_type  = OBJECT_MOBILEws;
 	m_phase = AFP_WAIT;  // paused until the first Init ()
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp
index 5cd4bf2..04ae230 100644
--- a/src/object/auto/autoflag.cpp
+++ b/src/object/auto/autoflag.cpp
@@ -52,8 +52,6 @@ static float g_flag3 = 2.00f;
 CAutoFlag::CAutoFlag(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp
index ad66702..6fb70e8 100644
--- a/src/object/auto/autohuston.cpp
+++ b/src/object/auto/autohuston.cpp
@@ -49,8 +49,6 @@ CAutoHuston::CAutoHuston(CInstanceManager* iMan, CObject* object)
 	D3DVECTOR	pos;
 	int			i;
 
-	CAuto::CAuto(iMan, object);
-
 	for ( i=0 ; i<HUSTONMAXLENS ; i++ )
 	{
 		m_lens[i].parti = -1;
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp
index e9708e0..f8d7bd3 100644
--- a/src/object/auto/autoinfo.cpp
+++ b/src/object/auto/autoinfo.cpp
@@ -50,8 +50,6 @@
 CAutoInfo::CAutoInfo(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp
index 1bcd11e..7c191a5 100644
--- a/src/object/auto/autojostle.cpp
+++ b/src/object/auto/autojostle.cpp
@@ -49,8 +49,6 @@
 CAutoJostle::CAutoJostle(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp
index 98c0f45..c090c6f 100644
--- a/src/object/auto/autokid.cpp
+++ b/src/object/auto/autokid.cpp
@@ -46,8 +46,6 @@
 CAutoKid::CAutoKid(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_soundChannel = -1;
 	Init();
 }
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp
index ce6214c..4c61abc 100644
--- a/src/object/auto/autolabo.cpp
+++ b/src/object/auto/autolabo.cpp
@@ -58,8 +58,6 @@ CAutoLabo::CAutoLabo(CInstanceManager* iMan, CObject* object)
 {
 	int		i;
 
-	CAuto::CAuto(iMan, object);
-
 	for ( i=0 ; i<3 ; i++ )
 	{
 		m_partiRank[i] = -1;
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp
index d1107ed..c4494a2 100644
--- a/src/object/auto/automush.cpp
+++ b/src/object/auto/automush.cpp
@@ -45,8 +45,6 @@
 CAutoMush::CAutoMush(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp
index a86e7b8..10e882a 100644
--- a/src/object/auto/autonest.cpp
+++ b/src/object/auto/autonest.cpp
@@ -44,8 +44,6 @@
 CAutoNest::CAutoNest(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp
index 824bfca..ace2b87 100644
--- a/src/object/auto/autonuclear.cpp
+++ b/src/object/auto/autonuclear.cpp
@@ -55,8 +55,6 @@
 CAutoNuclear::CAutoNuclear(CInstanceManager* iMan, CObject* object)
 						  : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_channelSound = -1;
 	Init();
 }
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp
index cb42e6d..38d6a38 100644
--- a/src/object/auto/autopara.cpp
+++ b/src/object/auto/autopara.cpp
@@ -51,8 +51,6 @@
 CAutoPara::CAutoPara(CInstanceManager* iMan, CObject* object)
 						  : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	m_channelSound = -1;
 	Init();
 }
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp
index c02348d..2b1e801 100644
--- a/src/object/auto/autoportico.cpp
+++ b/src/object/auto/autoportico.cpp
@@ -76,8 +76,6 @@ float Progress(float a, float b, float progress)
 CAutoPortico::CAutoPortico(CInstanceManager* iMan, CObject* object)
 						 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = APOP_WAIT;
 	m_soundChannel = -1;
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp
index 2353149..cabd46b 100644
--- a/src/object/auto/autoradar.cpp
+++ b/src/object/auto/autoradar.cpp
@@ -48,8 +48,6 @@
 CAutoRadar::CAutoRadar(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = ARAP_WAIT;
 	m_totalDetect = 0;
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp
index 6994842..e9f7e90 100644
--- a/src/object/auto/autorepair.cpp
+++ b/src/object/auto/autorepair.cpp
@@ -51,8 +51,6 @@
 CAutoRepair::CAutoRepair(CInstanceManager* iMan, CObject* object)
 						 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 	m_phase = ARP_WAIT;  // paused until the first Init ()
 }
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp
index b15a9b8..26db8fb 100644
--- a/src/object/auto/autoresearch.cpp
+++ b/src/object/auto/autoresearch.cpp
@@ -57,8 +57,6 @@ CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object)
 {
 	int		i;
 
-	CAuto::CAuto(iMan, object);
-
 	for ( i=0 ; i<6 ; i++ )
 	{
 		m_partiStop[i] = -1;
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp
index 5f1afad..21e279d 100644
--- a/src/object/auto/autoroot.cpp
+++ b/src/object/auto/autoroot.cpp
@@ -43,8 +43,6 @@
 CAutoRoot::CAutoRoot(CInstanceManager* iMan, CObject* object)
 					 : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp
index bdc6d32..a5043a3 100644
--- a/src/object/auto/autosafe.cpp
+++ b/src/object/auto/autosafe.cpp
@@ -58,8 +58,6 @@ CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object)
 {
 	int		i;
 
-	CAuto::CAuto(iMan, object);
-
 	for ( i=0 ; i<4 ; i++ )
 	{
 		m_bKey[i] = FALSE;
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp
index 1e23e1d..81d81fe 100644
--- a/src/object/auto/autostation.cpp
+++ b/src/object/auto/autostation.cpp
@@ -49,8 +49,6 @@
 CAutoStation::CAutoStation(CInstanceManager* iMan, CObject* object)
 						   : CAuto(iMan, object)
 {
-	CAuto::CAuto(iMan, object);
-
 	Init();
 }
 
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp
index 7dcdb05..d5cebcd 100644
--- a/src/object/auto/autotower.cpp
+++ b/src/object/auto/autotower.cpp
@@ -57,8 +57,6 @@ CAutoTower::CAutoTower(CInstanceManager* iMan, CObject* object)
 {
 	int		i;
 
-	CAuto::CAuto(iMan, object);
-
 	for ( i=0 ; i<4 ; i++ )
 	{
 		m_partiStop[i] = -1;
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;
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp
index c66edf2..dc3fc6b 100644
--- a/src/ui/mainmap.cpp
+++ b/src/ui/mainmap.cpp
@@ -214,7 +214,7 @@ float CMainMap::RetZoomMap()
 	CMap*		pm;
 	CSlider*	ps;
 
-	pw = (CWindow*)pw->SearchControl(EVENT_WINDOW1);
+	pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1);
 	if ( pw == 0 )  return ZOOM_MIN;
 
 	pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP);
-- 
cgit v1.2.3-1-g7c22