diff options
| author | Paramat <paramat@users.noreply.github.com> | 2019-02-26 04:26:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 04:26:25 +0000 |
| commit | 01cd63bd3bca0192dab2834faf414b022706a77e (patch) | |
| tree | 0e735b1555ceee05360600b380d30429239e9609 /src/client | |
| parent | d80186d8571261ad7d09d3498a9e8a6da63801a2 (diff) | |
| download | minetest-01cd63bd3bca0192dab2834faf414b022706a77e.tar.gz minetest-01cd63bd3bca0192dab2834faf414b022706a77e.tar.bz2 minetest-01cd63bd3bca0192dab2834faf414b022706a77e.zip | |
Revert CSM particles commit to fix particle spawner bug for 5.0.0 (#8288)
Reverts 5dab7426451842793b183fbd961ad2ae83c8acbd
"[CSM] Add functions to create particles and particlespawners."
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.h | 6 | ||||
| -rw-r--r-- | src/client/particles.h | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/client/client.h b/src/client/client.h index 60735f665..57623f164 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -565,10 +565,8 @@ private: // And relations to objects std::unordered_map<int, u16> m_sounds_to_objects; - // CSM/client IDs to SSM/server IDs Mapping - // Map server particle spawner IDs to client IDs - std::unordered_map<u32, u32> m_particles_server_to_client; - // Map server hud ids to client hud ids + // HUD + // Mapping from server hud ids to internal hud ids std::unordered_map<u32, u32> m_hud_server_to_client; // Privileges diff --git a/src/client/particles.h b/src/client/particles.h index 3392e7e95..d1854ecbf 100644 --- a/src/client/particles.h +++ b/src/client/particles.h @@ -196,14 +196,6 @@ public: void addNodeParticle(IGameDef *gamedef, LocalPlayer *player, v3s16 pos, const MapNode &n, const ContentFeatures &f); - u32 getSpawnerId() const - { - for (u32 id = 0;; ++id) { // look for unused particlespawner id - if (m_particle_spawners.find(id) == m_particle_spawners.end()) - return id; - } - } - protected: void addParticle(Particle* toadd); |