Merge branch 'milek-dev' into gfx-work

2026-03-22 15:05:03 +01:00 · 2019-08-08 15:35:25 +02:00
parent a955244f9f 1fa6313373
commit 37fea6db7a
26 changed files with 1158 additions and 68 deletions
--- a/simulation.cpp
+++ b/simulation.cpp
@@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/.
 #include "AnimModel.h"
 #include "DynObj.h"
 #include "lightarray.h"
+#include "particles.h"
 #include "scene.h"
 #include "Train.h"

@@ -38,6 +39,7 @@ train_table Trains;
 light_array Lights;
 sound_table Sounds;
 lua Lua;
+particle_manager Particles;

 scene::basic_region *Region { nullptr };
 TTrain *Train { nullptr };