From ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 16 Mar 2016 18:05:12 +0300
Subject: Split ParticleEngine from Particle class.

---
 src/game.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index 40d5478af..c59103bb6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -41,7 +41,7 @@
 
 #include "enums/being/beingdirection.h"
 
-#include "particle/particle.h"
+#include "particle/particleengine.h"
 
 #include "input/inputmanager.h"
 #include "input/joystick.h"
@@ -165,7 +165,7 @@ static void initEngines()
 #endif
     crazyMoves = new CrazyMoves;
 
-    particleEngine = new Particle;
+    particleEngine = new ParticleEngine;
     particleEngine->setMap(nullptr);
     particleEngine->setupEngine();
     BeingInfo::init();
@@ -777,9 +777,9 @@ void Game::adjustPerfomance()
                     break;
                 }
                 case 2:
-                    if (Particle::emitterSkip < 4)
+                    if (ParticleEngine::emitterSkip < 4)
                     {
-                        Particle::emitterSkip = 4;
+                        ParticleEngine::emitterSkip = 4;
                         if (localChatTab)
                         {
                             localChatTab->chatLog("Auto lower Particle "
@@ -826,14 +826,14 @@ void Game::resetAdjustLevel()
         case 2:
             config.setValue("beingopacity",
                 config.getBoolValue("beingopacity"));
-            Particle::emitterSkip = config.getIntValue(
+            ParticleEngine::emitterSkip = config.getIntValue(
                 "particleEmitterSkip") + 1;
             break;
         default:
         case 3:
             config.setValue("beingopacity",
                 config.getBoolValue("beingopacity"));
-            Particle::emitterSkip = config.getIntValue(
+            ParticleEngine::emitterSkip = config.getIntValue(
                 "particleEmitterSkip") + 1;
             config.setValue("alphaCache",
                 config.getBoolValue("alphaCache"));
@@ -1074,8 +1074,7 @@ void Game::changeMap(const std::string &mapPath)
 
     // Initialize map-based particle effects
     if (newMap)
-        newMap->initializeParticleEffects(particleEngine);
-
+        newMap->initializeParticleEffects();
 
     // Start playing new music file when necessary
     const std::string oldMusic = mCurrentMap
-- 
cgit v1.2.3-70-g09d2