summaryrefslogtreecommitdiffstats
path: root/src/object/auto
diff options
context:
space:
mode:
Diffstat (limited to 'src/object/auto')
-rw-r--r--src/object/auto/auto.h4
-rw-r--r--src/object/auto/autoderrick.cpp1
-rw-r--r--src/object/auto/autodestroyer.cpp13
-rw-r--r--src/object/auto/autoenergy.cpp1
-rw-r--r--src/object/auto/autofactory.cpp4
-rw-r--r--src/object/auto/autoflag.cpp1
-rw-r--r--src/object/auto/autoinfo.cpp1
-rw-r--r--src/object/auto/autojostle.cpp1
-rw-r--r--src/object/auto/autokid.cpp1
-rw-r--r--src/object/auto/autolabo.cpp5
-rw-r--r--src/object/auto/automush.cpp1
-rw-r--r--src/object/auto/autonest.cpp1
-rw-r--r--src/object/auto/autonuclear.cpp1
-rw-r--r--src/object/auto/autopara.cpp1
-rw-r--r--src/object/auto/autoradar.cpp1
-rw-r--r--src/object/auto/autorepair.cpp1
-rw-r--r--src/object/auto/autorepair.h1
-rw-r--r--src/object/auto/autoresearch.cpp5
-rw-r--r--src/object/auto/autoroot.cpp1
-rw-r--r--src/object/auto/autosafe.cpp2
-rw-r--r--src/object/auto/autostation.cpp1
-rw-r--r--src/object/auto/autotower.cpp3
22 files changed, 19 insertions, 32 deletions
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h
index e27804c..4a430ce 100644
--- a/src/object/auto/auto.h
+++ b/src/object/auto/auto.h
@@ -31,7 +31,7 @@ namespace Ui {
class CDisplayText;
class CInterface;
class CWindow;
-} /* Ui */
+} /* Ui */
namespace Gfx {
@@ -44,7 +44,7 @@ class CCloud;
class CCamera;
class CPlanet;
class CLightning;
-} /* Gfx */
+} /* Gfx */
class CAuto
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index 260edcb..b613406 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -589,4 +589,3 @@ Error CAutoDerrick::GetError()
return ERR_OK;
}
-
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index 8e3fa98..fdaebc0 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -82,8 +82,10 @@ Error CAutoDestroyer::StartAction(int param)
scrap = SearchPlastic();
if ( scrap == nullptr )
return ERR_DESTROY_NOTFOUND;
- else {
- if ( m_phase == ADEP_WAIT ) {
+ else
+ {
+ if ( m_phase == ADEP_WAIT )
+ {
scrap->SetLock(true); // usable waste
//? scrap->SetTruck(m_object); // usable waste
@@ -93,7 +95,8 @@ Error CAutoDestroyer::StartAction(int param)
m_progress = 0.0f;
m_speed = 1.0f/1.0f;
m_bExplo = false;
- } else
+ }
+ else
return ERR_GENERIC;
}
return ERR_OK;
@@ -147,7 +150,8 @@ bool CAutoDestroyer::EventProcess(const Event &event)
m_phase = ADEP_WAIT; // still waiting ...
m_progress = 0.0f;
m_speed = 1.0f/0.5f;
- if (m_main->GetSelect() == m_object) {
+ if (m_main->GetSelect() == m_object)
+ {
scrap = SearchPlastic();
if ( pw != 0 ) EnableInterface(pw, EVENT_OBJECT_BDESTROY, (scrap != 0));
}
@@ -403,3 +407,4 @@ void CAutoDestroyer::EnableInterface(Ui::CWindow *pw, EventType event, bool bSta
control->SetState(Ui::STATE_ENABLE, bState);
}
+
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp
index a0b4d85..6a8672b 100644
--- a/src/object/auto/autoenergy.cpp
+++ b/src/object/auto/autoenergy.cpp
@@ -649,3 +649,4 @@ bool CAutoEnergy::Read(char *line)
return true;
}
+
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp
index fb82497..a648656 100644
--- a/src/object/auto/autofactory.cpp
+++ b/src/object/auto/autofactory.cpp
@@ -209,8 +209,8 @@ bool CAutoFactory::EventProcess(const Event &event)
if ( event.type == EVENT_OBJECT_FACTORYrs ) type = OBJECT_MOBILErs;
if ( event.type == EVENT_OBJECT_FACTORYsa ) type = OBJECT_MOBILEsa;
- Error err = StartAction(type);
- if( err != ERR_OK && err != ERR_GENERIC )
+ Error err = StartAction(type);
+ if( err != ERR_OK && err != ERR_GENERIC )
m_displayText->DisplayError(err, m_object);
if( err != ERR_GENERIC )
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp
index 936546d..cc00db0 100644
--- a/src/object/auto/autoflag.cpp
+++ b/src/object/auto/autoflag.cpp
@@ -159,4 +159,3 @@ Error CAutoFlag::GetError()
return ERR_OK;
}
-
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp
index e8f31c8..6d4a484 100644
--- a/src/object/auto/autoinfo.cpp
+++ b/src/object/auto/autoinfo.cpp
@@ -513,4 +513,3 @@ bool CAutoInfo::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp
index df82ad5..5ce01c2 100644
--- a/src/object/auto/autojostle.cpp
+++ b/src/object/auto/autojostle.cpp
@@ -142,4 +142,3 @@ Error CAutoJostle::IsEnded()
return m_error;
}
-
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp
index a9f86b0..7d61d64 100644
--- a/src/object/auto/autokid.cpp
+++ b/src/object/auto/autokid.cpp
@@ -197,4 +197,3 @@ Error CAutoKid::GetError()
return ERR_OK;
}
-
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp
index 8424b93..172a618 100644
--- a/src/object/auto/autolabo.cpp
+++ b/src/object/auto/autolabo.cpp
@@ -177,8 +177,8 @@ bool CAutoLabo::EventProcess(const Event &event)
Error err = ERR_GENERIC;
if ( event.type == EVENT_OBJECT_RiPAW ) err = StartAction(RESEARCH_iPAW);
if ( event.type == EVENT_OBJECT_RiGUN ) err = StartAction(RESEARCH_iGUN);
-
- if( err != ERR_OK && err != ERR_GENERIC )
+
+ if( err != ERR_OK && err != ERR_GENERIC )
m_displayText->DisplayError(err, m_object);
if( err != ERR_GENERIC )
@@ -632,4 +632,3 @@ bool CAutoLabo::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp
index e97e2a1..1e4796d 100644
--- a/src/object/auto/automush.cpp
+++ b/src/object/auto/automush.cpp
@@ -342,4 +342,3 @@ bool CAutoMush::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp
index 1cf13d6..8a2d644 100644
--- a/src/object/auto/autonest.cpp
+++ b/src/object/auto/autonest.cpp
@@ -273,4 +273,3 @@ bool CAutoNest::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp
index 75bfb45..224776d 100644
--- a/src/object/auto/autonuclear.cpp
+++ b/src/object/auto/autonuclear.cpp
@@ -484,4 +484,3 @@ bool CAutoNuclear::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp
index ad6517b..24bc119 100644
--- a/src/object/auto/autopara.cpp
+++ b/src/object/auto/autopara.cpp
@@ -327,4 +327,3 @@ bool CAutoPara::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp
index 1a10aa7..4afd3fe 100644
--- a/src/object/auto/autoradar.cpp
+++ b/src/object/auto/autoradar.cpp
@@ -305,4 +305,3 @@ bool CAutoRadar::SearchEnemy(Math::Vector &pos)
return true;
}
-
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp
index 67aa9af..2f813f8 100644
--- a/src/object/auto/autorepair.cpp
+++ b/src/object/auto/autorepair.cpp
@@ -340,4 +340,3 @@ bool CAutoRepair::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h
index 31a3c65..f522a55 100644
--- a/src/object/auto/autorepair.h
+++ b/src/object/auto/autorepair.h
@@ -63,4 +63,3 @@ protected:
float m_lastParticle;
};
-
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp
index 7564bb8..8308ebe 100644
--- a/src/object/auto/autoresearch.cpp
+++ b/src/object/auto/autoresearch.cpp
@@ -176,8 +176,8 @@ bool CAutoResearch::EventProcess(const Event &event)
if ( event.type == EVENT_OBJECT_RPHAZER ) err = StartAction(RESEARCH_PHAZER);
if ( event.type == EVENT_OBJECT_RSHIELD ) err = StartAction(RESEARCH_SHIELD);
if ( event.type == EVENT_OBJECT_RATOMIC ) err = StartAction(RESEARCH_ATOMIC);
-
- if( err != ERR_OK && err != ERR_GENERIC )
+
+ if( err != ERR_OK && err != ERR_GENERIC )
m_displayText->DisplayError(err, m_object);
if( err != ERR_GENERIC )
@@ -607,4 +607,3 @@ bool CAutoResearch::Read(char *line)
return true;
}
-
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp
index a390e90..7e5c5e7 100644
--- a/src/object/auto/autoroot.cpp
+++ b/src/object/auto/autoroot.cpp
@@ -115,4 +115,3 @@ Error CAutoRoot::GetError()
return ERR_OK;
}
-
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp
index 58c459a..2871a70 100644
--- a/src/object/auto/autosafe.cpp
+++ b/src/object/auto/autosafe.cpp
@@ -611,5 +611,3 @@ CObject* CAutoSafe::SearchVehicle()
return 0;
}
-
-
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp
index 4ace2ac..2c0aa02 100644
--- a/src/object/auto/autostation.cpp
+++ b/src/object/auto/autostation.cpp
@@ -368,4 +368,3 @@ void CAutoStation::UpdateInterface(float rTime)
}
}
-
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp
index e3b06cf..17a41f4 100644
--- a/src/object/auto/autotower.cpp
+++ b/src/object/auto/autotower.cpp
@@ -397,7 +397,7 @@ void CAutoTower::FireStopUpdate(float progress, bool bLightOn)
pos.y = 18.0f;
pos.z = listpos[i*2+1];
pos = Transform(*mat, pos);
-
+
m_partiStop[i] = m_particle->CreateParticle(pos, speed,
dim, Gfx::PARTISELR,
1.0f, 0.0f, 0.0f);
@@ -544,4 +544,3 @@ bool CAutoTower::Read(char *line)
return true;
}
-
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-29 10:25:34 +0000