From 0e0c49c11b091dd17d9f9a65d21af45749fffe56 Mon Sep 17 00:00:00 2001
From: Florian Rival <Florian.Rival@gmail.com>
Date: Sat, 26 May 2018 21:46:59 -0700
Subject: [PATCH] Fix Get/SetConeSprayAngle in ParticleEmitterObject

---
 Extensions/ParticleSystem/ParticleEmitterObject.cpp | 12 ++++++------
 Extensions/ParticleSystem/ParticleEmitterObject.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Extensions/ParticleSystem/ParticleEmitterObject.cpp b/Extensions/ParticleSystem/ParticleEmitterObject.cpp
index d322f980b1..99d8055768 100644
--- a/Extensions/ParticleSystem/ParticleEmitterObject.cpp
+++ b/Extensions/ParticleSystem/ParticleEmitterObject.cpp
@@ -42,11 +42,11 @@ ParticleEmitterBase::ParticleEmitterBase()
     : rendererType(Point),
       rendererParam1(3.0f),
       rendererParam2(1.0f),
-      additive(true),
+      additive(false),
       tank(-1),
-      flow(300),
-      emitterForceMin(25.0f),
-      emitterForceMax(65.0f),
+      flow(45),
+      emitterForceMin(45.0f),
+      emitterForceMax(85.0f),
       emitterXDirection(0.0f),
       emitterYDirection(1.0f),
       emitterZDirection(0.0f),
@@ -54,7 +54,7 @@ ParticleEmitterBase::ParticleEmitterBase()
       emitterAngleB(90),
       zoneRadius(3.0f),
       particleGravityX(0.0f),
-      particleGravityY(-100.0f),
+      particleGravityY(0.0f),
       particleGravityZ(0.0f),
       friction(2.0f),
       particleLifeTimeMin(0.5f),
@@ -83,7 +83,7 @@ ParticleEmitterBase::ParticleEmitterBase()
       particleSizeRandomness2(0),
       particleAngleRandomness1(0),
       particleAngleRandomness2(0),
-      maxParticleNb(5000),
+      maxParticleNb(300),
       destroyWhenNoParticles(true),
       particleSystem(NULL) {}
 
diff --git a/Extensions/ParticleSystem/ParticleEmitterObject.h b/Extensions/ParticleSystem/ParticleEmitterObject.h
index 6c8082ad87..e1779dee42 100644
--- a/Extensions/ParticleSystem/ParticleEmitterObject.h
+++ b/Extensions/ParticleSystem/ParticleEmitterObject.h
@@ -90,7 +90,7 @@ class GD_EXTENSION_API ParticleEmitterBase {
   void SetEmitterAngleA(float newValue);
   void SetEmitterAngleB(float newValue);
   void SetConeSprayAngle(float newValue) {
-    SetEmitterAngleB(newValue / 180.0f * 3.14159f);
+    SetEmitterAngleB(newValue);
   };
   void SetZoneRadius(float newValue);
   void SetParticleGravityX(float newValue);
@@ -208,7 +208,7 @@ class GD_EXTENSION_API ParticleEmitterBase {
   float GetEmitterAngleA() const { return emitterAngleA; };
   float GetEmitterAngleB() const { return emitterAngleB; };
   float GetConeSprayAngle() const {
-    return GetEmitterAngleB() * 180.0f / 3.14159f;
+    return GetEmitterAngleB();
   };
   float GetZoneRadius() const { return zoneRadius; };
   float GetParticleGravityX() const { return particleGravityX; };