Merge 2a71c7fce2 into 8d431f8feb

Add client setting to restore old freeze stars

CMakeLists.txt

@@ -2162,6 +2162,8 @@ set_src(GAME_SHARED GLOB src/game
   mapitems_ex.cpp
   mapitems_ex.h
   mapitems_ex_types.h
+  mapitems_fng.h
+  mapitems_vanilla.h
   prng.cpp
   prng.h
   teamscore.cpp

src/engine/shared/config_variables.h

@@ -73,6 +73,7 @@ MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE,
 MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
 MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show eye wheel along together with emotes")
 MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long the eyes emotes last")
+MACRO_CONFIG_INT(ClFreezeStars, cl_freeze_stars, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show old star particles for frozen tees")
 
 MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the air jump indicator")
 MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")

src/game/client/gameclient.cpp

@@ -2071,6 +2071,32 @@ void CGameClient::OnNewSnapshot()
 				m_Effects.AirJump(Pos, Alpha);
 			}
 
+	if(g_Config.m_ClFreezeStars && !m_SuppressEvents)
+	{
+		for(auto &Character : m_Snap.m_aCharacters)
+		{
+			if(Character.m_Active && Character.m_HasExtendedData && Character.m_PrevExtendedData)
+			{
+				int FreezeTimeNow = Character.m_ExtendedData.m_FreezeEnd - Client()->GameTick(g_Config.m_ClDummy);
+				int FreezeTimePrev = Character.m_PrevExtendedData->m_FreezeEnd - Client()->PrevGameTick(g_Config.m_ClDummy);
+				vec2 Pos = vec2(Character.m_Cur.m_X, Character.m_Cur.m_Y);
+				int StarsNow = (FreezeTimeNow + 1) / Client()->GameTickSpeed();
+				int StarsPrev = (FreezeTimePrev + 1) / Client()->GameTickSpeed();
+				if(StarsNow < StarsPrev || (StarsPrev == 0 && StarsNow > 0))
+				{
+					int Amount = StarsNow + 1;
+					float Mid = 3 * pi / 2;
+					float Min = Mid - pi / 3;
+					float Max = Mid + pi / 3;
+					for(int j = 0; j < Amount; j++)
+					{
+						float Angle = mix(Min, Max, (j + 1) / (float)(Amount + 2));
+						m_Effects.DamageIndicator(Pos, direction(Angle));
+					}
+				}
+			}
+		}
+	}
 	if(m_Snap.m_LocalClientId != m_PrevLocalId)
 		m_PredictedDummyId = m_PrevLocalId;
 	m_PrevLocalId = m_Snap.m_LocalClientId;

src/game/editor/editor.h

@@ -1044,50 +1044,6 @@ public:
 		TILE_PUB_ENTITIES_OFF2,
 	};
 
-	enum
-	{
-		TILE_FNG_SPIKE_GOLD = 7,
-		TILE_FNG_SPIKE_NORMAL,
-		TILE_FNG_SPIKE_RED,
-		TILE_FNG_SPIKE_BLUE,
-		TILE_FNG_SCORE_RED,
-		TILE_FNG_SCORE_BLUE,
-
-		TILE_FNG_SPIKE_GREEN = 14,
-		TILE_FNG_SPIKE_PURPLE,
-
-		TILE_FNG_SPAWN = 192,
-		TILE_FNG_SPAWN_RED,
-		TILE_FNG_SPAWN_BLUE,
-		TILE_FNG_FLAG_RED,
-		TILE_FNG_FLAG_BLUE,
-		TILE_FNG_SHIELD,
-		TILE_FNG_HEART,
-		TILE_FNG_SHOTGUN,
-		TILE_FNG_GRENADE,
-		TILE_FNG_NINJA,
-		TILE_FNG_LASER,
-
-		TILE_FNG_SPIKE_OLD1 = 208,
-		TILE_FNG_SPIKE_OLD2,
-		TILE_FNG_SPIKE_OLD3
-	};
-
-	enum
-	{
-		TILE_VANILLA_SPAWN = 192,
-		TILE_VANILLA_SPAWN_RED,
-		TILE_VANILLA_SPAWN_BLUE,
-		TILE_VANILLA_FLAG_RED,
-		TILE_VANILLA_FLAG_BLUE,
-		TILE_VANILLA_SHIELD,
-		TILE_VANILLA_HEART,
-		TILE_VANILLA_SHOTGUN,
-		TILE_VANILLA_GRENADE,
-		TILE_VANILLA_NINJA,
-		TILE_VANILLA_LASER,
-	};
-
 	// Explanations
 	enum class EExplanation
 	{

src/game/editor/explanations.cpp

@@ -1,3 +1,6 @@
+#include <game/mapitems_fng.h>
+#include <game/mapitems_vanilla.h>
+
 #include "editor.h"
 
 // DDNet entity explanations by Lady Saavik

src/game/mapitems_fng.h

@@ -0,0 +1,33 @@
+#ifndef GAME_MAPITEMS_FNG_H
+#define GAME_MAPITEMS_FNG_H
+
+enum
+{
+	TILE_FNG_SPIKE_GOLD = 7,
+	TILE_FNG_SPIKE_NORMAL,
+	TILE_FNG_SPIKE_RED,
+	TILE_FNG_SPIKE_BLUE,
+	TILE_FNG_SCORE_RED,
+	TILE_FNG_SCORE_BLUE,
+
+	TILE_FNG_SPIKE_GREEN = 14,
+	TILE_FNG_SPIKE_PURPLE,
+
+	TILE_FNG_SPAWN = 192,
+	TILE_FNG_SPAWN_RED,
+	TILE_FNG_SPAWN_BLUE,
+	TILE_FNG_FLAG_RED,
+	TILE_FNG_FLAG_BLUE,
+	TILE_FNG_SHIELD,
+	TILE_FNG_HEART,
+	TILE_FNG_SHOTGUN,
+	TILE_FNG_GRENADE,
+	TILE_FNG_NINJA,
+	TILE_FNG_LASER,
+
+	TILE_FNG_SPIKE_OLD1 = 208,
+	TILE_FNG_SPIKE_OLD2,
+	TILE_FNG_SPIKE_OLD3
+};
+
+#endif

src/game/mapitems_vanilla.h

@@ -0,0 +1,19 @@
+#ifndef GAME_MAPITEMS_VANILLA_H
+#define GAME_MAPITEMS_VANILLA_H
+
+enum
+{
+	TILE_VANILLA_SPAWN = 192,
+	TILE_VANILLA_SPAWN_RED,
+	TILE_VANILLA_SPAWN_BLUE,
+	TILE_VANILLA_FLAG_RED,
+	TILE_VANILLA_FLAG_BLUE,
+	TILE_VANILLA_SHIELD,
+	TILE_VANILLA_HEART,
+	TILE_VANILLA_SHOTGUN,
+	TILE_VANILLA_GRENADE,
+	TILE_VANILLA_NINJA,
+	TILE_VANILLA_LASER,
+};
+
+#endif