diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 22:23:05 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 22:23:05 +0200 |
commit | ebed57aa22b772211387a5561f995eee8f5faed1 (patch) | |
tree | 9a0b08371df54c125957e63c7ecff81c001d4eaf /src/object/task/taskfire.h | |
parent | fc5389d18816799ba2698914384cd099ba8a7a6c (diff) | |
download | colobot-ebed57aa22b772211387a5561f995eee8f5faed1.tar.gz colobot-ebed57aa22b772211387a5561f995eee8f5faed1.tar.bz2 colobot-ebed57aa22b772211387a5561f995eee8f5faed1.zip |
Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix
(except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
Diffstat (limited to 'src/object/task/taskfire.h')
-rw-r--r-- | src/object/task/taskfire.h | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index 43f654e..f06b9f6 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -1,52 +1,52 @@ -// * This file is part of the COLOBOT source code
-// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
-// *
-// * This program is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see http://www.gnu.org/licenses/.
-
-// taskfire.h
-
-#pragma once
-
-
-#include "object/task/task.h"
-
-
-
-class CTaskFire : public CTask
-{
-public:
- CTaskFire(CInstanceManager* iMan, CObject* object);
- ~CTaskFire();
-
- bool EventProcess(const Event &event);
-
- Error Start(float delay);
- Error IsEnded();
- bool Abort();
-
-protected:
-
-protected:
- float m_delay;
- float m_progress;
- bool m_bError;
- bool m_bRay;
- bool m_bOrganic;
- float m_time;
- float m_speed;
- float m_lastParticule;
- float m_lastSound;
- int m_soundChannel;
-};
-
+// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// taskfire.h + +#pragma once + + +#include "object/task/task.h" + + + +class CTaskFire : public CTask +{ +public: + CTaskFire(CInstanceManager* iMan, CObject* object); + ~CTaskFire(); + + bool EventProcess(const Event &event); + + Error Start(float delay); + Error IsEnded(); + bool Abort(); + +protected: + +protected: + float m_delay; + float m_progress; + bool m_bError; + bool m_bRay; + bool m_bOrganic; + float m_time; + float m_speed; + float m_lastParticule; + float m_lastSound; + int m_soundChannel; +}; + |