diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-05-26 17:47:54 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-05-27 10:19:16 +0200 |
| commit | 8765d58b02c9afd00186bae4a0045dff32f7d102 (patch) | |
| tree | 884cd72d4b8b2fabbd109001412e315aa908b0e8 /src/object/auto/autodestroyer.cpp | |
| parent | 538745a731d07facd7a1574c04a5d34d23ce3bfa (diff) | |
| download | colobot-8765d58b02c9afd00186bae4a0045dff32f7d102.tar.gz colobot-8765d58b02c9afd00186bae4a0045dff32f7d102.tar.bz2 colobot-8765d58b02c9afd00186bae4a0045dff32f7d102.zip | |
Fixed code formatting
* moved braces to new lines
* fixed some function/variable names
* fixed whitespace issues
Diffstat (limited to 'src/object/auto/autodestroyer.cpp')
| -rw-r--r-- | src/object/auto/autodestroyer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
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); } + |