rain-plus/zombiesurvival-evolved
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Attempt to fix redeem crash.

Browse source 
Fixed redeem crash.
Fixed redeem texture for some reason having alpha channel of another
texture.
This commit is contained in:
JetBoom 2014-11-08 16:17:07 -05:00
parent dde4ca2486
commit dca4ef001d
7 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt
View file

@ -1,8 +0,0 @@
"UnlitGeneric"
{
"$translucent" 1
"$basetexture" "killicon/redeem"
"$vertexcolor" 0
"$ignorez" 1
"$additive" 1
}

BIN
gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf
View file

Binary file not shown.

10
gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vmt Normal file
View file

@ -0,0 +1,10 @@
"UnlitGeneric"
{
"$basetexture" "killicon/redeem_v2"
"$nolod" 1
"$nomip" 1
"$ignorez" 1
"$translucent" 1
"$vertexalpha" 1
"$vertexcolor" 1
}

BIN
gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vtf Normal file
View file

Binary file not shown.

2
gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua
View file

@ -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)

1
gamemodes/zombiesurvival/gamemode/cl_init.lua
View file

@ -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(...)

20
gamemodes/zombiesurvival/gamemode/init.lua
View file

@ -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)