entWatch4: Streamline code + Intermission change.

Block 'Press', 'Touch' and 'Pickup' during intermission.
2018-08-08 17:31:50 +02:00
parent d4b9a3887b
commit b4116d7282
4 changed files with 178 additions and 168 deletions
@@ -48,7 +48,7 @@ public APLRes AskPluginLoad2(Handle hMyself, bool bLate, char[] sError, int erro
 	CreateNative("EW_ClientRestrict",   Native_ClientRestrict);
 	CreateNative("EW_ClientUnrestrict", Native_ClientUnrestrict);
 	CreateNative("EW_ClientRestricted", Native_ClientRestricted);
-	
+
 	RegPluginLibrary("entWatch-restrictions");
 	return APLRes_Success;
 }
@@ -60,14 +60,14 @@ public void OnPluginStart()
 {
 	LoadTranslations("common.phrases");
 	LoadTranslations("entWatch.restrictions.phrases");
-	
+
 	g_hFwd_OnClientRestricted   = CreateGlobalForward("EW_OnClientRestricted",   ET_Ignore, Param_Cell, Param_Cell, Param_Cell);
 	g_hFwd_OnClientUnrestricted = CreateGlobalForward("EW_OnClientUnrestricted", ET_Ignore, Param_Cell, Param_Cell);
-	
+
 	g_hCookie_RestrictIssued = RegClientCookie("EW_RestrictIssued", "", CookieAccess_Private);
 	g_hCookie_RestrictLength = RegClientCookie("EW_RestrictLength", "", CookieAccess_Private);
 	g_hCookie_RestrictExpire = RegClientCookie("EW_RestrictExpire", "", CookieAccess_Private);
-	
+
 	RegAdminCmd("sm_eban",   Command_ClientRestrict,   ADMFLAG_BAN);
 	RegAdminCmd("sm_eunban", Command_ClientUnrestrict, ADMFLAG_UNBAN);
 }
@@ -102,18 +102,18 @@ public Action Command_ClientRestrict(int client, int args)
 		CReplyToCommand(client, "\x07%s[entWatch] \x07%sUsage: sm_eban <#userid/name> [duration]", "E01B5D", "F16767");
 		return Plugin_Handled;
 	}
-	
+
 	char sTarget[32];
 	char sLength[32];
 	GetCmdArg(1, sTarget, sizeof(sTarget));
 	GetCmdArg(2, sLength, sizeof(sLength));
-	
+
 	int target;
 	if ((target = FindTarget(client, sTarget, true)) == -1)
 		return Plugin_Handled;
-	
+
 	int length = StringToInt(sLength);
-	
+
 	if (ClientRestrict(client, target, length))
 	{
 		if (length)
@@ -127,7 +127,7 @@ public Action Command_ClientRestrict(int client, int args)
 			LogAction(client, target, "%L restricted %L permanently.", client, target);
 		}
 	}
-	
+
 	return Plugin_Handled;
 }

@@ -141,20 +141,20 @@ public Action Command_ClientUnrestrict(int client, int args)
 		CReplyToCommand(client, "\x07%s[entWatch] \x07%sUsage: sm_eunban <#userid/name>", "E01B5D", "F16767");
 		return Plugin_Handled;
 	}
-	
+
 	char sTarget[32];
 	GetCmdArg(1, sTarget, sizeof(sTarget));
-	
+
 	int target;
 	if ((target = FindTarget(client, sTarget, true)) == -1)
 		return Plugin_Handled;
-	
+
 	if (ClientUnrestrict(client, target))
 	{
 		CPrintToChatAll("\x07%s[entWatch] \x07%s%N\x07%s unrestricted \x07%s%N\x07%s.", "E01B5D", "EDEDED", client, "F16767", "EDEDED", target, "F16767");
 		LogAction(client, target, "%L unrestricted %L.", client, target);
 	}
-	
+
 	return Plugin_Handled;
 }

@@ -181,25 +181,25 @@ stock bool ClientRestrict(int client, int target, int length)
 {
 	if (!Client_IsValid(client) || !Client_IsValid(target) || !AreClientCookiesCached(target) || ClientRestricted(target))
 		return false;
-	
+
 	int issued = GetTime();
 	int second = length * 60;
 	int expire = issued + second;
-	
+
 	g_iRestrictIssued[target] = issued;
 	g_iRestrictLength[target] = length;
 	g_iRestrictExpire[target] = expire;
-	
+
 	SetClientCookieInt(target, g_hCookie_RestrictIssued, issued);
 	SetClientCookieInt(target, g_hCookie_RestrictLength, length);
 	SetClientCookieInt(target, g_hCookie_RestrictExpire, expire);
-	
+
 	Call_StartForward(g_hFwd_OnClientRestricted);
 	Call_PushCell(client);
 	Call_PushCell(target);
 	Call_PushCell(length);
 	Call_Finish();
-	
+
 	return true;
 }

@@ -210,20 +210,20 @@ stock bool ClientUnrestrict(int client, int target)
 {
 	if (!Client_IsValid(client) || !Client_IsValid(target) || !AreClientCookiesCached(target) || !ClientRestricted(target))
 		return false;
-	
+
 	g_iRestrictIssued[target] = 0;
 	g_iRestrictLength[target] = 0;
 	g_iRestrictExpire[target] = 0;
-	
+
 	SetClientCookieInt(target, g_hCookie_RestrictIssued, 0);
 	SetClientCookieInt(target, g_hCookie_RestrictLength, 0);
 	SetClientCookieInt(target, g_hCookie_RestrictExpire, 0);
-	
+
 	Call_StartForward(g_hFwd_OnClientUnrestricted);
 	Call_PushCell(client);
 	Call_PushCell(target);
 	Call_Finish();
-	
+
 	return true;
 }

@@ -234,19 +234,19 @@ stock bool ClientRestricted(int client)
 {
 	if (!Client_IsValid(client))
 		return false;
-	
+
 	//Block them when loading cookies..
 	if (!AreClientCookiesCached(client))
 		return true;
-	
+
 	//Permanent restriction..
 	if (g_iRestrictExpire[client] && g_iRestrictLength[client] == 0)
 		return true;
-	
+
 	//Limited restriction..
 	if (g_iRestrictExpire[client] && g_iRestrictExpire[client] >= GetTime())
 		return true;
-	
+
 	return false;
 }

@@ -281,7 +281,7 @@ stock void SetClientCookieInt(int client, Handle hCookie, int value)
 {
 	char sValue[32];
 	IntToString(value, sValue, sizeof(sValue));
-	
+
 	SetClientCookie(client, hCookie, sValue);
 }

@@ -292,6 +292,6 @@ stock int GetClientCookieInt(int client, Handle hCookie)
 {
 	char sValue[32];
 	GetClientCookie(client, hCookie, sValue, sizeof(sValue));
-	
+
 	return StringToInt(sValue);
 }