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

Merge pull request #201 from Mka0207/master

Browse source 
ZombieVision moved to clientside.
This commit is contained in:
William Moodhe 2019-03-18 18:53:47 -04:00 committed by GitHub
commit 0fbb2037c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1779,6 +1779,10 @@ function GM:PlayerBindPress(pl, bind, wasin)
self.ZombieThirdPerson = not self.ZombieThirdPerson self.ZombieThirdPerson = not self.ZombieThirdPerson
elseif P_Team(pl) == TEAM_HUMAN then elseif P_Team(pl) == TEAM_HUMAN then
self:ToggleOTSCamera() self:ToggleOTSCamera()
end
elseif bind == "impulse 100" then
if P_Team(pl) == TEAM_UNDEAD and pl:Alive() then
self:ToggleZombieVision()
end end
end end
end end

4
gamemodes/zombiesurvival/gamemode/cl_postprocess.lua
View file

@ -260,10 +260,6 @@ function GM:ToggleZombieVision(onoff)
end end
end end
net.Receive("zs_togglezvision", function(length)
gamemode.Call("ToggleZombieVision")
end)
local CModWhiteOut = { local CModWhiteOut = {
["$pp_colour_addr"] = 0, ["$pp_colour_addr"] = 0,
["$pp_colour_addg"] = 0, ["$pp_colour_addg"] = 0,

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

@ -474,7 +474,6 @@ function GM:AddNetworkStrings()
util.AddNetworkString("zs_deployableout") util.AddNetworkString("zs_deployableout")
util.AddNetworkString("zs_trinketconsumed") util.AddNetworkString("zs_trinketconsumed")
util.AddNetworkString("zs_nailremoved") util.AddNetworkString("zs_nailremoved")
util.AddNetworkString("zs_togglezvision")
util.AddNetworkString("zs_remantlercontent") util.AddNetworkString("zs_remantlercontent")
util.AddNetworkString("zs_classunlockstate") util.AddNetworkString("zs_classunlockstate")
util.AddNetworkString("zs_changeclass") util.AddNetworkString("zs_changeclass")
@ -4309,11 +4308,6 @@ end
function GM:PlayerSwitchFlashlight(pl, newstate) function GM:PlayerSwitchFlashlight(pl, newstate)
if pl:Team() == TEAM_UNDEAD then if pl:Team() == TEAM_UNDEAD then
if newstate then
net.Start("zs_togglezvision")
net.Send(pl)
end
return false return false
end end