luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Revert CSM particles commit to fix particle spawner bug for 5.0.0 (#8288)

Browse Source 
Reverts 5dab742645
"[CSM] Add functions to create particles and particlespawners."
This commit is contained in:
Paramat
2019-02-26 04:26:25 +00:00
committed by GitHub
parent d80186d857
commit 01cd63bd3b
10 changed files with 8 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/client.h
View File

@@ -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

8
src/client/particles.h
View File

@@ -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);