diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-16 18:05:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-16 18:15:50 +0300 |
| commit | ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e (patch) | |
| tree | 0feb142dc738715d3216f0832f94ae4c3716fc30 /src/game.cpp | |
| parent | 117c99ff5c8358624df6d176860ac64c86b6fa5f (diff) | |
| download | mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.gz mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.bz2 mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.xz mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.zip | |
Split ParticleEngine from Particle class.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
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 |