Particles: Do not add digging particles for airlike nodes (#6392)

SmallJoker · web-flow · commit 1105a14bccef · 2017-09-08T18:39:24.000+02:00
diff --git a/src/game.cpp b/src/game.cpp
@@ -4032,7 +4032,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
 
 		if (m_cache_enable_particles) {
 			const ContentFeatures &features = client->getNodeDefManager()->get(n);
-			client->getParticleManager()->addPunchingParticles(client,
+			client->getParticleManager()->addNodeParticle(client,
 					player, nodepos, n, features);
 		}
 	}
diff --git a/src/particles.cpp b/src/particles.cpp
@@ -601,21 +601,23 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, Client *client,
 void ParticleManager::addDiggingParticles(IGameDef* gamedef,
 	LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
 {
+	// No particles for "airlike" nodes
+	if (f.drawtype == NDT_AIRLIKE)
+		return;
+
 	// set the amount of particles here
 	for (u16 j = 0; j < 32; j++) {
 		addNodeParticle(gamedef, player, pos, n, f);
 	}
 }
 
-void ParticleManager::addPunchingParticles(IGameDef* gamedef,
-	LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
-{
-	addNodeParticle(gamedef, player, pos, n, f);
-}
-
 void ParticleManager::addNodeParticle(IGameDef* gamedef,
 	LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f)
 {
+	// No particles for "airlike" nodes
+	if (f.drawtype == NDT_AIRLIKE)
+		return;
+
 	// Texture
 	u8 texid = myrand_range(0, 5);
 	const TileLayer &tile = f.tiles[texid].layers[0];
diff --git a/src/particles.h b/src/particles.h
@@ -185,9 +185,6 @@ friend class ParticleSpawner;
 	void addDiggingParticles(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
 		const MapNode &n, const ContentFeatures &f);
 
-	void addPunchingParticles(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
-		const MapNode &n, const ContentFeatures &f);
-
 	void addNodeParticle(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
 		const MapNode &n, const ContentFeatures &f);
 

Original file line number	Diff line number	Diff line change
`@@ -4032,7 +4032,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,`
`4032`	`4032`
`4033`	`4033`	`if (m_cache_enable_particles) {`
`4034`	`4034`	`const ContentFeatures &features = client->getNodeDefManager()->get(n);`
`4035`		`- client->getParticleManager()->addPunchingParticles(client,`
	`4035`	`+ client->getParticleManager()->addNodeParticle(client,`
`4036`	`4036`	`player, nodepos, n, features);`
`4037`	`4037`	`}`
`4038`	`4038`	`}`