Merge branch 'miami' into lcs

# Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
2021-06-28 05:16:21 +03:00
parent 3e9c983f5c f8297df9c5
commit eaebaa6db3
31 changed files with 460 additions and 386 deletions
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -20,7 +20,8 @@
 #include "ParticleObject.h"
 #include "Particle.h"
 #include "soundlist.h"
-
+#include "SaveBuf.h"
+#include "debugmenu.h"

 #define MAX_PARTICLES_ON_SCREEN   (750)