From dca4ef001d4b229f81f765b126ee9c85b809485c Mon Sep 17 00:00:00 2001 From: JetBoom Date: Sat, 8 Nov 2014 16:17:07 -0500 Subject: [PATCH] Attempt to fix redeem crash. Fixed redeem crash. Fixed redeem texture for some reason having alpha channel of another texture. --- .../content/materials/killicon/redeem.vmt | 8 ------- .../content/materials/killicon/redeem.vtf | Bin 5552 -> 0 bytes .../content/materials/killicon/redeem_v2.vmt | 10 +++++++++ .../content/materials/killicon/redeem_v2.vtf | Bin 0 -> 4304 bytes .../gamemode/cl_deathnotice.lua | 2 +- gamemodes/zombiesurvival/gamemode/cl_init.lua | 1 + gamemodes/zombiesurvival/gamemode/init.lua | 20 +++++++++--------- 7 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt delete mode 100644 gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf create mode 100644 gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vmt create mode 100644 gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vtf diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt b/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt deleted file mode 100644 index 661fb7a..0000000 --- a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt +++ /dev/null @@ -1,8 +0,0 @@ -"UnlitGeneric" -{ - "$translucent" 1 - "$basetexture" "killicon/redeem" - "$vertexcolor" 0 - "$ignorez" 1 - "$additive" 1 -} diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf b/gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf deleted file mode 100644 index 76fe67e1e5da61eaf4b3c3d1c24e76c63a07fc90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5552 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 T*UNv6-zb0Yd~NLC7kmEzOiwt- literal 0 HcmV?d00001 diff --git a/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua b/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua index 8818dd0..60d79e5 100644 --- a/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua +++ b/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua @@ -63,7 +63,7 @@ killicon.AddFont("weapon_slam", "zsdeathnotice", "*", color_white) killicon.AddFont("weapon_crowbar", "zsdeathnotice", "6", color_white) killicon.AddFont("headshot", "zsdeathnoticecs", "D", color_white) -killicon.Add("redeem", "killicon/redeem", color_white) +killicon.Add("redeem", "killicon/redeem_v2", color_white) killicon.Add("weapon_zs_zombie", "zombiesurvival/killicons/zombie", color_white) killicon.Add("weapon_zs_freshdead", "zombiesurvival/killicons/zombie", color_white) diff --git a/gamemodes/zombiesurvival/gamemode/cl_init.lua b/gamemodes/zombiesurvival/gamemode/cl_init.lua index 3c55421..20f11ad 100644 --- a/gamemodes/zombiesurvival/gamemode/cl_init.lua +++ b/gamemodes/zombiesurvival/gamemode/cl_init.lua @@ -1,4 +1,5 @@ -- Sometimes persistent ones don't get created. +-- Sometimes persistent ones don't get created. local dummy = CreateClientConVar("_zs_dummyconvar", 1, false, false) local oldCreateClientConVar = CreateClientConVar function CreateClientConVar(...) diff --git a/gamemodes/zombiesurvival/gamemode/init.lua b/gamemodes/zombiesurvival/gamemode/init.lua index 9a6cd6d..c27d9a9 100644 --- a/gamemodes/zombiesurvival/gamemode/init.lua +++ b/gamemodes/zombiesurvival/gamemode/init.lua @@ -216,8 +216,8 @@ function GM:AddResources() end resource.AddFile("materials/refract_ring.vmt") - resource.AddFile("materials/killicon/redeem.vtf") - resource.AddFile("materials/killicon/redeem.vmt") + resource.AddFile("materials/killicon/redeem_v2.vtf") + resource.AddFile("materials/killicon/redeem_v2.vmt") resource.AddFile("materials/killicon/zs_axe.vtf") resource.AddFile("materials/killicon/zs_keyboard.vtf") resource.AddFile("materials/killicon/zs_sledgehammer.vtf") @@ -1670,20 +1670,13 @@ function GM:GetDynamicSpawning() end function GM:PlayerRedeemed(pl, silent, noequip) - if not silent then - net.Start("zs_playerredeemed") - net.WriteEntity(pl) - net.WriteString(pl:Name()) - net.Broadcast() - end - pl:RemoveStatus("overridemodel", false, true) pl:ChangeTeam(TEAM_HUMAN) - pl:DoHulls() if not noequip then pl.m_PreRedeem = true end pl:UnSpectateAndSpawn() pl.m_PreRedeem = nil + pl:DoHulls() local frags = pl:Frags() if frags < 0 then @@ -1697,6 +1690,13 @@ function GM:PlayerRedeemed(pl, silent, noequip) pl:SetZombieClass(self.DefaultZombieClass) pl.SpawnedTime = CurTime() + + if not silent then + net.Start("zs_playerredeemed") + net.WriteEntity(pl) + net.WriteString(pl:Name()) + net.Broadcast() + end end function GM:PlayerDisconnected(pl)