Merge pull request #484 from KZGlobalTeam/dev

zealain · web-flow · commit 4ce210ac8ac5 · 2024-07-15T20:11:28.000+02:00
3.6.2
diff --git a/addons/sourcemod/scripting/gokz-core/misc.sp b/addons/sourcemod/scripting/gokz-core/misc.sp
@@ -677,9 +677,9 @@ static int FindUseEntity(int client)
 				float m_vecMins[3];
 				float m_vecMaxs[3];
 				float m_vecOrigin[3];
-				GetEntPropVector(ent, Prop_Send, "m_vecOrigin", m_vecOrigin);
-				GetEntPropVector(ent, Prop_Send, "m_vecMins", m_vecMins);
-				GetEntPropVector(ent, Prop_Send, "m_vecMaxs", m_vecMaxs);
+				GetEntPropVector(client, Prop_Send, "m_vecOrigin", m_vecOrigin);
+				GetEntPropVector(client, Prop_Send, "m_vecMins", m_vecMins);
+				GetEntPropVector(client, Prop_Send, "m_vecMaxs", m_vecMaxs);
 
 				delta[2] = IntervalDistance(endpos[2], m_vecOrigin[2] + m_vecMins[2], m_vecOrigin[2] + m_vecMaxs[2]);
 				if (GetVectorLength(delta) < 80.0)
diff --git a/addons/sourcemod/scripting/gokz-global.sp b/addons/sourcemod/scripting/gokz-global.sp
@@ -374,7 +374,7 @@ public void OnMapEnd()
 public void GOKZ_OnOptionChanged(int client, const char[] option, any newValue)
 {
 	if (StrEqual(option, gC_CoreOptionNames[Option_Mode])
-		&& GlobalAPI_IsInit())
+		&& GlobalAPI_IsInit() && IsClientAuthorized(client))
 	{
 		UpdatePoints(client);
 	}
diff --git a/addons/sourcemod/scripting/gokz-jumpstats.sp b/addons/sourcemod/scripting/gokz-jumpstats.sp
@@ -112,9 +112,10 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
 	return Plugin_Continue;
 }
 
-public void OnPlayerRunCmdPost(int client, int buttons, int impulse, const float vel[3], const float angles[3], int weapon, int subtype, int cmdnum, int tickcount, int seed, const int mouse[2])
+public Action Movement_OnPlayerMovePost(int client)
 {
-	OnPlayerRunCmdPost_JumpTracking(client);
+	Movement_OnPlayerMovePost_JumpTracking(client);
+	return Plugin_Continue;
 }
 
 public void Movement_OnStartTouchGround(int client)
diff --git a/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp b/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp
@@ -1425,19 +1425,15 @@ public Action Movement_OnWalkMovePost(int client)
 	return Plugin_Continue;
 }
 
-public Action Movement_OnPlayerMovePost(int client)
-{
-	lastMovementProcessedTime[client] = jumpTrackers[client].tickCount;
-	return Plugin_Continue;
-}
 
-public void OnPlayerRunCmdPost_JumpTracking(int client)
+public void Movement_OnPlayerMovePost_JumpTracking(int client)
 {
 	if (!IsValidClient(client) || !IsPlayerAlive(client))
 	{
 		return;
 	}
 	
+	lastMovementProcessedTime[client] = jumpTrackers[client].tickCount;
 	// Check for always failstats
 	if (doFailstatAlways[client])
 	{
diff --git a/addons/sourcemod/scripting/gokz-mode-kztimer.sp b/addons/sourcemod/scripting/gokz-mode-kztimer.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-kztimer.txt"
 
-#define MODE_VERSION 217
+#define MODE_VERSION 2170
 #define DUCK_SPEED_NORMAL 8.0
 #define PRE_VELMOD_MAX 1.104 // Calculated 276/250
 #define PERF_SPEED_CAP 380.0
diff --git a/addons/sourcemod/scripting/gokz-mode-simplekz.sp b/addons/sourcemod/scripting/gokz-mode-simplekz.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-simplekz.txt"
 
-#define MODE_VERSION 21
+#define MODE_VERSION 210
 #define PS_MAX_REWARD_TURN_RATE 0.703125 // Degrees per tick (90 degrees per second)
 #define PS_MAX_TURN_RATE_DECREMENT 0.015625 // Degrees per tick (2 degrees per second)
 #define PS_SPEED_MAX 26.54321 // Units
diff --git a/addons/sourcemod/scripting/gokz-mode-vanilla.sp b/addons/sourcemod/scripting/gokz-mode-vanilla.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-vanilla.txt"
 
-#define MODE_VERSION 17
+#define MODE_VERSION 170
 
 float gF_ModeCVarValues[MODECVAR_COUNT] = 
 {
diff --git a/addons/sourcemod/scripting/gokz-replays/controls.sp b/addons/sourcemod/scripting/gokz-replays/controls.sp
@@ -165,13 +165,13 @@ int MenuHandler_ReplayControls(Menu menu, MenuAction action, int param1, int par
 		{
 			if (!IsValidClient(param1))
 			{
-				return;
+				return 0;
 			}
 
 			int bot = GetBotFromClient(GetObserverTarget(param1));
 			if (bot == -1 || controllingPlayer[bot] != param1)
 			{
-				return;
+				return 0;
 			}
 			
 			char info[16];
@@ -207,6 +207,7 @@ int MenuHandler_ReplayControls(Menu menu, MenuAction action, int param1, int par
 			delete menu;
 		}
 	}
+	return 0;
 }
 
 void CancelReplayControls(int client)
diff --git a/addons/sourcemod/scripting/gokz-replays/playback.sp b/addons/sourcemod/scripting/gokz-replays/playback.sp
@@ -1005,7 +1005,7 @@ void PlaybackVersion2(int client, int bot, int &buttons, float vel[3], float ang
 		{
 			newButtons |= IN_JUMP;
 		}
-		if (currentTickData.flags & RP_IN_DUCK || currentTickData.flags & RP_FL_DUCKING)
+		if (currentTickData.flags & RP_IN_DUCK)
 		{
 			newButtons |= IN_DUCK;
 		}
@@ -1206,6 +1206,13 @@ void PlaybackVersion2Post(int client, int bot)
 		{
 			SetEntityFlags(client, entityFlags | FL_INWATER);
 		}
+		if (currentTickData.flags & RP_FL_DUCKING)
+		{
+			SetEntPropFloat(client, Prop_Send, "m_flDuckAmount", 1.0);
+			SetEntProp(client, Prop_Send, "m_bDucking", false);
+			SetEntProp(client, Prop_Send, "m_bDucked", true);
+			SetEntityFlags(client, FL_DUCKING);
+		}
 
 		botSpeed[bot] = GetVectorHorizontalLength(currentTickData.velocity);
 		playbackTick[bot]++;
diff --git a/addons/sourcemod/scripting/gokz-tpanglefix.sp b/addons/sourcemod/scripting/gokz-tpanglefix.sp
@@ -131,15 +131,15 @@ void PatchAngleFix()
 {
 	if (LoadFromAddress(gA_ViewAnglePatchAddress, NumberType_Int8) == 0)
 	{
-		StoreToAddress(gA_ViewAnglePatchAddress, 1, NumberType_Int8);
+		StoreToAddress(gA_ViewAnglePatchAddress, 1, NumberType_Int8, false);
 	}
 }
 
 void RestoreAngleFix()
 {
 	if (LoadFromAddress(gA_ViewAnglePatchAddress, NumberType_Int8) == 1)
 	{
-		StoreToAddress(gA_ViewAnglePatchAddress, 0, NumberType_Int8);
+		StoreToAddress(gA_ViewAnglePatchAddress, 0, NumberType_Int8, false);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ public void OnMapEnd()`
`374`	`374`	`public void GOKZ_OnOptionChanged(int client, const char[] option, any newValue)`
`375`	`375`	`{`
`376`	`376`	`if (StrEqual(option, gC_CoreOptionNames[Option_Mode])`
`377`		`- && GlobalAPI_IsInit())`
	`377`	`+ && GlobalAPI_IsInit() && IsClientAuthorized(client))`
`378`	`378`	`{`
`379`	`379`	`UpdatePoints(client);`
`380`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,10 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3`
`112`	`112`	`return Plugin_Continue;`
`113`	`113`	`}`
`114`	`114`
`115`		`-public void OnPlayerRunCmdPost(int client, int buttons, int impulse, const float vel[3], const float angles[3], int weapon, int subtype, int cmdnum, int tickcount, int seed, const int mouse[2])`
	`115`	`+public Action Movement_OnPlayerMovePost(int client)`
`116`	`116`	`{`
`117`		`- OnPlayerRunCmdPost_JumpTracking(client);`
	`117`	`+ Movement_OnPlayerMovePost_JumpTracking(client);`
	`118`	`+ return Plugin_Continue;`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`public void Movement_OnStartTouchGround(int client)`
Original file line number	Diff line number	Diff line change
`@@ -1425,19 +1425,15 @@ public Action Movement_OnWalkMovePost(int client)`
`1425`	`1425`	`return Plugin_Continue;`
`1426`	`1426`	`}`
`1427`	`1427`
`1428`		`-public Action Movement_OnPlayerMovePost(int client)`
`1429`		`-{`
`1430`		`- lastMovementProcessedTime[client] = jumpTrackers[client].tickCount;`
`1431`		`- return Plugin_Continue;`
`1432`		`-}`
`1433`	`1428`
`1434`		`-public void OnPlayerRunCmdPost_JumpTracking(int client)`
	`1429`	`+public void Movement_OnPlayerMovePost_JumpTracking(int client)`
`1435`	`1430`	`{`
`1436`	`1431`	`if (!IsValidClient(client) \|\| !IsPlayerAlive(client))`
`1437`	`1432`	`{`
`1438`	`1433`	`return;`
`1439`	`1434`	`}`
`1440`	`1435`
	`1436`	`+ lastMovementProcessedTime[client] = jumpTrackers[client].tickCount;`
`1441`	`1437`	`// Check for always failstats`
`1442`	`1438`	`if (doFailstatAlways[client])`
`1443`	`1439`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public Plugin myinfo =`
`29`	`29`
`30`	`30`	`#define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-vanilla.txt"`
`31`	`31`
`32`		`-#define MODE_VERSION 17`
	`32`	`+#define MODE_VERSION 170`
`33`	`33`
`34`	`34`	`float gF_ModeCVarValues[MODECVAR_COUNT] =`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -165,13 +165,13 @@ int MenuHandler_ReplayControls(Menu menu, MenuAction action, int param1, int par`
`165`	`165`	`{`
`166`	`166`	`if (!IsValidClient(param1))`
`167`	`167`	`{`
`168`		`- return;`
	`168`	`+ return 0;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`int bot = GetBotFromClient(GetObserverTarget(param1));`
`172`	`172`	`if (bot == -1 \|\| controllingPlayer[bot] != param1)`
`173`	`173`	`{`
`174`		`- return;`
	`174`	`+ return 0;`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`char info[16];`
`@@ -207,6 +207,7 @@ int MenuHandler_ReplayControls(Menu menu, MenuAction action, int param1, int par`
`207`	`207`	`delete menu;`
`208`	`208`	`}`
`209`	`209`	`}`
	`210`	`+ return 0;`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`void CancelReplayControls(int client)`
Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ void PlaybackVersion2(int client, int bot, int &buttons, float vel[3], float ang`
`1005`	`1005`	`{`
`1006`	`1006`	`newButtons \|= IN_JUMP;`
`1007`	`1007`	`}`
`1008`		`- if (currentTickData.flags & RP_IN_DUCK \|\| currentTickData.flags & RP_FL_DUCKING)`
	`1008`	`+ if (currentTickData.flags & RP_IN_DUCK)`
`1009`	`1009`	`{`
`1010`	`1010`	`newButtons \|= IN_DUCK;`
`1011`	`1011`	`}`
`@@ -1206,6 +1206,13 @@ void PlaybackVersion2Post(int client, int bot)`
`1206`	`1206`	`{`
`1207`	`1207`	`SetEntityFlags(client, entityFlags \| FL_INWATER);`
`1208`	`1208`	`}`
	`1209`	`+ if (currentTickData.flags & RP_FL_DUCKING)`
	`1210`	`+ {`
	`1211`	`+ SetEntPropFloat(client, Prop_Send, "m_flDuckAmount", 1.0);`
	`1212`	`+ SetEntProp(client, Prop_Send, "m_bDucking", false);`
	`1213`	`+ SetEntProp(client, Prop_Send, "m_bDucked", true);`
	`1214`	`+ SetEntityFlags(client, FL_DUCKING);`
	`1215`	`+ }`
`1209`	`1216`
`1210`	`1217`	`botSpeed[bot] = GetVectorHorizontalLength(currentTickData.velocity);`
`1211`	`1218`	`playbackTick[bot]++;`
Original file line number	Diff line number	Diff line change
`@@ -131,15 +131,15 @@ void PatchAngleFix()`
`131`	`131`	`{`
`132`	`132`	`if (LoadFromAddress(gA_ViewAnglePatchAddress, NumberType_Int8) == 0)`
`133`	`133`	`{`
`134`		`- StoreToAddress(gA_ViewAnglePatchAddress, 1, NumberType_Int8);`
	`134`	`+ StoreToAddress(gA_ViewAnglePatchAddress, 1, NumberType_Int8, false);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`void RestoreAngleFix()`
`139`	`139`	`{`
`140`	`140`	`if (LoadFromAddress(gA_ViewAnglePatchAddress, NumberType_Int8) == 1)`
`141`	`141`	`{`
`142`		`- StoreToAddress(gA_ViewAnglePatchAddress, 0, NumberType_Int8);`
	`142`	`+ StoreToAddress(gA_ViewAnglePatchAddress, 0, NumberType_Int8, false);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`