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

1 files changed, 68 insertions, 68 deletions

diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h
index 3c65d2e..b41c513 100644
--- a/src/object/task/taskpen.h
+++ b/src/object/task/taskpen.h
@@ -1,68 +1,68 @@
-// * 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/.

-

-// taskpen.h

-

-#pragma once

-

-

-#include "object/task/task.h"

-#include "math/vector.h"

-

-

-

-enum TaskPenPhase

-{

-	TPP_UP		= 1,	// rises the pencil

-	TPP_TURN	= 2,	// turns the carousel

-	TPP_DOWN	= 3,	// descends the pencil

-};

-

-

-

-class CTaskPen : public CTask

-{

-public:

-	CTaskPen(CInstanceManager* iMan, CObject* object);

-	~CTaskPen();

-

-	bool		EventProcess(const Event &event);

-

-	Error		Start(bool bDown, int color);

-	Error		IsEnded();

-	bool		Abort();

-

-protected:

-	void		SoundManip(float time, float amplitude, float frequency);

-	int			AngleToRank(float angle);

-	float		ColorToAngle(int color);

-	int			ColorToRank(int color);

-

-protected:

-	bool			m_bError;

-	TaskPenPhase	m_phase;

-	float			m_progress;

-	float			m_delay;

-	float			m_time;

-	float			m_lastParticule;

-	Math::Vector		m_supportPos;

-

-	float			m_timeUp;

-	float			m_oldAngle;

-	float			m_newAngle;

-	float			m_timeDown;

-};

-

+// * 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/.
+
+// taskpen.h
+
+#pragma once
+
+
+#include "object/task/task.h"
+#include "math/vector.h"
+
+
+
+enum TaskPenPhase
+{
+    TPP_UP      = 1,    // rises the pencil
+    TPP_TURN    = 2,    // turns the carousel
+    TPP_DOWN    = 3,    // descends the pencil
+};
+
+
+
+class CTaskPen : public CTask
+{
+public:
+    CTaskPen(CInstanceManager* iMan, CObject* object);
+    ~CTaskPen();
+
+    bool        EventProcess(const Event &event);
+
+    Error       Start(bool bDown, int color);
+    Error       IsEnded();
+    bool        Abort();
+
+protected:
+    void        SoundManip(float time, float amplitude, float frequency);
+    int         AngleToRank(float angle);
+    float       ColorToAngle(int color);
+    int         ColorToRank(int color);
+
+protected:
+    bool            m_bError;
+    TaskPenPhase    m_phase;
+    float           m_progress;
+    float           m_delay;
+    float           m_time;
+    float           m_lastParticule;
+    Math::Vector        m_supportPos;
+
+    float           m_timeUp;
+    float           m_oldAngle;
+    float           m_newAngle;
+    float           m_timeDown;
+};
+