From f953258a9ddea624ba6c624af162993b3ba22d2d Mon Sep 17 00:00:00 2001
From: prefect <nicolai@wildfiregames.com>
Date: Sat, 21 Jan 2006 20:01:17 +0000
Subject: [PATCH] Fix Linux build, don't EVER #include <windows.h> again!

Removed some apparently unnecessary #includes
Merged multiple M_PI definitions into maths/MathUtil.h
Add newline at end of file

This was SVN commit r3384.
---
 source/graphics/DefaultEmitter.cpp  |  3 ++-
 source/graphics/DefaultEmitter.h    |  2 +-
 source/graphics/ParticleEmitter.cpp |  2 +-
 source/graphics/ParticleEmitter.h   | 18 +++---------------
 source/graphics/ParticleEngine.cpp  |  3 +--
 source/graphics/ParticleEngine.h    |  2 +-
 source/lib/res/sound/snd.cpp        |  5 +----
 source/maths/MathUtil.h             |  8 ++++++++
 8 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/source/graphics/DefaultEmitter.cpp b/source/graphics/DefaultEmitter.cpp
index e2b93d14a0..dddbb7a76e 100644
--- a/source/graphics/DefaultEmitter.cpp
+++ b/source/graphics/DefaultEmitter.cpp
@@ -7,6 +7,7 @@
 /////////////////////////////////////////////////////
 
 #include "precompiled.h"
+#include "maths/MathUtil.h"
 #include "DefaultEmitter.h"
 
 CDefaultEmitter::CDefaultEmitter(const int MAX_PARTICLES, const int lifetime) : CEmitter(MAX_PARTICLES, lifetime)
@@ -154,4 +155,4 @@ bool CDefaultEmitter::updateEmitter()
 		}
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/source/graphics/DefaultEmitter.h b/source/graphics/DefaultEmitter.h
index 1b3b7ae8e4..d8ba60c7cb 100644
--- a/source/graphics/DefaultEmitter.h
+++ b/source/graphics/DefaultEmitter.h
@@ -35,4 +35,4 @@ public:
 	virtual ~CDefaultEmitter(void);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/graphics/ParticleEmitter.cpp b/source/graphics/ParticleEmitter.cpp
index 5a4d39978c..8403031075 100755
--- a/source/graphics/ParticleEmitter.cpp
+++ b/source/graphics/ParticleEmitter.cpp
@@ -186,4 +186,4 @@ bool CEmitter::renderEmitter()
 		return true;
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/source/graphics/ParticleEmitter.h b/source/graphics/ParticleEmitter.h
index e0f394a7a9..c5b97e37c0 100755
--- a/source/graphics/ParticleEmitter.h
+++ b/source/graphics/ParticleEmitter.h
@@ -9,20 +9,6 @@
 #ifndef _PARTICLEEMITTER_H_
 #define _PARTICLEEMITTER_H_
 
-#include "precompiled.h"
-#include <iostream>
-#include <windows.h>
-#include "ogl.h"
-#include <math.h>
-
-#define M_PI        3.14159265358979323846f
-#define HALF_PI	    1.57079632679489661923f
-
-#define DEGTORAD(d)	((d * (float)M_PI) / 180.0f);
-#define RADTODEG(r)	((r * 180.0f) /(float)M_PI);
-
-const int HALF_RAND = (RAND_MAX / 2);
-
 struct tVector
 {
 	float x,y,z;
@@ -30,6 +16,8 @@ struct tVector
 
 class CEmitter
 {
+	static const int HALF_RAND = (RAND_MAX / 2);
+
 public:
 	struct tColor
 	{
@@ -265,4 +253,4 @@ public:
 	virtual ~CEmitter(void);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/graphics/ParticleEngine.cpp b/source/graphics/ParticleEngine.cpp
index 2be1ccd703..70720eec9d 100644
--- a/source/graphics/ParticleEngine.cpp
+++ b/source/graphics/ParticleEngine.cpp
@@ -8,7 +8,6 @@
 
 #include "precompiled.h"
 #include "ParticleEngine.h"
-#include <windows.h>
 #include "ogl.h"
 
 CParticleEngine *CParticleEngine::m_pInstance = 0;
@@ -250,4 +249,4 @@ void CParticleEngine::LeaveParticleContext(void)
 	glPopMatrix();
 	glEnable(GL_LIGHTING);
 	glDisable(GL_BLEND);
-}
\ No newline at end of file
+}
diff --git a/source/graphics/ParticleEngine.h b/source/graphics/ParticleEngine.h
index 0e70f41ee3..97421621f4 100644
--- a/source/graphics/ParticleEngine.h
+++ b/source/graphics/ParticleEngine.h
@@ -139,4 +139,4 @@ private:
 	friend class CEmitter;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/lib/res/sound/snd.cpp b/source/lib/res/sound/snd.cpp
index 46d745b9ec..12da2ea34a 100755
--- a/source/lib/res/sound/snd.cpp
+++ b/source/lib/res/sound/snd.cpp
@@ -25,10 +25,7 @@
 #include <deque>
 #include <math.h>
 
-// (some math.h versions omit this)
-#ifndef M_PI
-# define M_PI 3.14159265358979323846
-#endif
+#include "maths/MathUtil.h"
 
 #ifdef __APPLE__
 # include <OpenAL/alut.h>
diff --git a/source/maths/MathUtil.h b/source/maths/MathUtil.h
index 9c54d1c859..14e4308a98 100755
--- a/source/maths/MathUtil.h
+++ b/source/maths/MathUtil.h
@@ -5,6 +5,14 @@
 #define PI							3.14159265358979323846f
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifndef M_PI_2
+#define M_PI_2 1.57079632679489661923
+#endif
+
 #define DEGTORAD(a)					((a) * (PI/180.0f))
 #define RADTODEG(a)					((a) * (180.0f/PI))
 #define SQR(x)						((x) * (x))