Rework csdm_protection (#25)

* Remove sprite protection

* Remove block_damage option

Author: wopox1337

cstrike/addons/amxmodx/configs/csdm/config.ini

@@ -45,11 +45,6 @@ hide_hud_flags = "ft"
 ; 0 = disable
 protection_time = 2.0
 
-; Protection time icon (notify).
-; Note: It works if "protection_time" above 1.9 sec.
-; Sprite name defined in hud.txt ("" = disabled).
-sprite_name = "suithelmet_full"
-
 ; Colors of glow shell, leave this in quotes
 ; The digits are "R G B"
 ; random value "random"
@@ -59,8 +54,6 @@ render_color_ct = "0 0 220"
 ; Alpha transparency (as A gets higher, the glow shell is thicker)
 render_alpha = 15
 
-; Protected player can't take damage
-block_damage = 1
 
 
 [mapcleaner]

cstrike/addons/amxmodx/configs/csdm/extraconfigs/_de_dust2.ini

@@ -45,10 +45,6 @@ hide_hud_flags = "ft"
 ; 0 = disable
 protection_time = 2.0
 
-; Protection time icon (notify).
-; Note: It works if "protection_time" above 1.9 sec.
-; Sprite name defined in hud.txt ("" = disabled).
-sprite_name = "suithelmet_full"
 
 ; Colors of glow shell, leave this in quotes
 ; The digits are "R G B"
@@ -59,8 +55,6 @@ render_color_ct = "0 0 220"
 ; Alpha transparency (as A gets higher, the glow shell is thicker)
 render_alpha = 15
 
-; Protected player can't take damage
-block_damage = 1
 
 
 [mapcleaner]

cstrike/addons/amxmodx/configs/csdm/extraconfigs/_prefix_de.ini

@@ -45,11 +45,6 @@ hide_hud_flags = "ft"
 ; 0 = disable
 protection_time = 2.0
 
-; Protection time icon (notify).
-; Note: It works if "protection_time" above 1.9 sec.
-; Sprite name defined in hud.txt ("" = disabled).
-sprite_name = "suithelmet_full"
-
 ; Colors of glow shell, leave this in quotes
 ; The digits are "R G B"
 ; random value "random"
@@ -59,8 +54,6 @@ render_color_ct = "0 0 220"
 ; Alpha transparency (as A gets higher, the glow shell is thicker)
 render_alpha = 15
 
-; Protected player can't take damage
-block_damage = 1
 
 
 [mapcleaner]

cstrike/addons/amxmodx/scripting/CSDM_ReAPI/csdm_protection.sma

@@ -2,28 +2,9 @@
 #include <csdm>
 
 
-#define IsPlayer(%1)				(1 <= (%1) <= g_iMaxPlayers)
-#define PlayerTask(%1)				(%1 + PROTECTION_TASK_ID)
-#define GetPlayerByTaskID(%1)		(%1 - PROTECTION_TASK_ID)
-
-const PROTECTION_TASK_ID = 216897
-
-enum color_e { Float:R, Float:G, Float:B }
-
-enum
-{
-	STATUSICON_HIDE,
-	STATUSICON_SHOW,
-	STATUSICON_FLASH
-}
-
-new bool:g_bIsProtected[MAX_CLIENTS + 1]
-new g_iMaxPlayers
-
-new g_szSpriteName[18] = "suithelmet_full" // max lenght = 16
-new Float:g_flRenderAlpha = 10.0, bool:g_bBlockDamage = true, Float: g_fImmunityTime;
-new Float:g_flTeamColors[TeamName][color_e] =
-{
+new Float:g_fImmunityTime
+new Float:g_flRenderAlpha = 10.0
+new Float:g_flTeamColors[TeamName][3] = {
 	{0.0, 0.0, 0.0},
 	{235.0, 0.0, 0.0}, // TEAM_TERRORIST
 	{0.0, 0.0, 235.0}, // TEAM_CT
@@ -39,16 +20,8 @@ public plugin_init()
 {
 	register_plugin("CSDM Protection", CSDM_VERSION, "wopox1337")
 
-	if(g_fImmunityTime > 0.0) {
-		if(g_bBlockDamage)
-			RegisterHookChain(RG_CSGameRules_FPlayerCanTakeDamage, "CSGameRules_FPlayerCanTakeDmg", .post = false)
-
-		RegisterHookChain(RG_CBasePlayer_SetSpawnProtection, "CBasePlayer_SetSpawnProtection", .post = true)
-		RegisterHookChain(RG_CBasePlayer_RemoveSpawnProtection, "CBasePlayer_RemoveSpawnProtection", .post = true)
-
-	}
-
-	g_iMaxPlayers = get_maxplayers()
+	RegisterHookChain(RG_CBasePlayer_SetSpawnProtection, "CBasePlayer_SetSpawnProtection", .post = true)
+	RegisterHookChain(RG_CBasePlayer_RemoveSpawnProtection, "CBasePlayer_RemoveSpawnProtection", .post = true)
 }
 
 public CSDM_Initialized(const szVersion[])
@@ -64,28 +37,14 @@ public CSDM_ConfigurationLoad(const ReadTypes:iReadAction)
 
 public CBasePlayer_SetSpawnProtection(const pPlayer, Float: time)
 {
-	SetEffects(pPlayer, time)
+	SetEffects(pPlayer)
 }
 
 public CBasePlayer_RemoveSpawnProtection(const pPlayer)
 {
 	RemoveEffects(pPlayer)
 }
 
-public CSGameRules_FPlayerCanTakeDmg(const pPlayer, const pAttacker)
-{
-	if(pPlayer == pAttacker || !IsPlayer(pAttacker))
-		return HC_CONTINUE
-
-	if(g_bIsProtected[pAttacker]) // protected attacker can't take damage
-	{
-		SetHookChainReturn(ATYPE_INTEGER, false)
-		return HC_SUPERCEDE
-	}
-
-	return HC_CONTINUE
-}
-
 public ReadCfg(const szLineData[], const iSectionID)
 {
 	new szKey[MAX_KEY_LEN], szValue[MAX_VALUE_LEN], szSign[2]
@@ -96,15 +55,6 @@ public ReadCfg(const szLineData[], const iSectionID)
 	{
 		g_fImmunityTime = str_to_float(szValue)
 	}
-	else if(equali(szKey, "block_damage"))
-	{
-		g_bBlockDamage = bool:(str_to_num(szValue))
-	}
-	else if(equali(szKey, "sprite_name"))
-	{
-		copy(g_szSpriteName, charsmax(g_szSpriteName), szValue)
-		strtolower(g_szSpriteName)
-	}
 	else if(equali(szKey, "render_color_", 13))
 	{
 		new szRed[4], szGreen[4], szBlue[4]
@@ -113,13 +63,13 @@ public ReadCfg(const szLineData[], const iSectionID)
 
 		if(parse(szValue, szRed, charsmax(szRed), szGreen, charsmax(szGreen), szBlue, charsmax(szBlue)) == 3)
 		{
-			g_flTeamColors[iTeam][R] = floatclamp(str_to_float(szRed), 1.0, 255.0)
-			g_flTeamColors[iTeam][G] = floatclamp(str_to_float(szGreen), 1.0, 255.0)
-			g_flTeamColors[iTeam][B] = floatclamp(str_to_float(szBlue), 1.0, 255.0)
+			g_flTeamColors[iTeam][0] = floatclamp(str_to_float(szRed), 1.0, 255.0)
+			g_flTeamColors[iTeam][1] = floatclamp(str_to_float(szGreen), 1.0, 255.0)
+			g_flTeamColors[iTeam][2] = floatclamp(str_to_float(szBlue), 1.0, 255.0)
 		}
 		else if(equali(szValue, "random"))
 		{
-			g_flTeamColors[iTeam][R] = g_flTeamColors[iTeam][G] = g_flTeamColors[iTeam][B] = 0.0
+			g_flTeamColors[iTeam][0] = g_flTeamColors[iTeam][1] = g_flTeamColors[iTeam][2] = 0.0
 		}
 	}
 	else if(equali(szKey, "render_alpha"))
@@ -128,51 +78,23 @@ public ReadCfg(const szLineData[], const iSectionID)
 	}
 }
 
-SetEffects(const pPlayer, Float: time)
+SetEffects(const pPlayer)
 {
 // https://github.com/s1lentq/ReGameDLL_CS/blob/bc2c3176e46e2c32ebc0110e7df879ea7ddbfafa/regamedll/dlls/player.cpp#L9532
 	set_entvar(pPlayer, var_rendermode, kRenderFxNone)
 
 	new TeamName:iTeam = get_member(pPlayer, m_iTeam)
-	if(!g_flTeamColors[iTeam][R] && !g_flTeamColors[iTeam][G] && !g_flTeamColors[iTeam][B])
-	{
-		new Float:flColor[color_e]
-		flColor[R] = random_float(1.0, 255.0)
-		flColor[G] = random_float(1.0, 255.0)
-		flColor[B] = random_float(1.0, 255.0)
+	new bool: isRandomColor = (!g_flTeamColors[iTeam][0] && !g_flTeamColors[iTeam][1] && !g_flTeamColors[iTeam][2])
+	if(!isRandomColor) {
+		rg_set_rendering(pPlayer, kRenderFxGlowShell, g_flTeamColors[iTeam], g_flRenderAlpha)
 
-		rg_set_rendering(pPlayer, kRenderFxGlowShell, flColor, g_flRenderAlpha)
-	}
-	else rg_set_rendering(pPlayer, kRenderFxGlowShell, g_flTeamColors[iTeam], g_flRenderAlpha)
-
-	if(g_szSpriteName[0] && time >= 1.5) {
-		SendStatusIcon(pPlayer, STATUSICON_FLASH)
+		return
 	}
-}
 
-RemoveEffects(const pPlayer)
-{
-	if(is_user_connected(pPlayer))
-	{
-		rg_set_rendering(pPlayer)
+	new Float:flColor[3]
+	flColor[0] = random_float(1.0, 255.0)
+	flColor[1] = random_float(1.0, 255.0)
+	flColor[2] = random_float(1.0, 255.0)
 
-		if(g_szSpriteName[0]) {
-			SendStatusIcon(pPlayer)
-		}
-	}
-}
-
-stock SendStatusIcon(const pPlayer, iStatus = STATUSICON_HIDE, red = 0, green = 160, blue = 0)
-{
-	static iMsgIdStatusIcon
-	if(iMsgIdStatusIcon || (iMsgIdStatusIcon = get_user_msgid("StatusIcon")))
-	{
-		message_begin(MSG_ONE_UNRELIABLE, iMsgIdStatusIcon, .player = pPlayer)
-		write_byte(iStatus)			// status: 0 - off, 1 - on, 2 - flash
-		write_string(g_szSpriteName)
-		write_byte(red)
-		write_byte(green)
-		write_byte(blue)
-		message_end()
-	}
+	rg_set_rendering(pPlayer, kRenderFxGlowShell, flColor, g_flRenderAlpha)
 }