From 58a768f99cb6b85c4cbef50af82a1a2366214d2a Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 10 Jun 2006 23:17:17 +0000 Subject: [PATCH] fixed electro secondary sound team remapping now works git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1553 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/teamplay.c | 8 ++++++++ data/qcsrc/server/gamec/w_electro.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/gamec/teamplay.c b/data/qcsrc/server/gamec/teamplay.c index d25641e27..8e851edc5 100644 --- a/data/qcsrc/server/gamec/teamplay.c +++ b/data/qcsrc/server/gamec/teamplay.c @@ -791,6 +791,7 @@ void SV_ChangeTeam(float _color) dteam = 4; // remap invalid teams in dom & ctf + /* if(cvar("g_ctf") && dteam == 3) dteam = 2; else if(cvar("g_ctf") && dteam == 4) @@ -807,6 +808,13 @@ void SV_ChangeTeam(float _color) if(dteam == 4) dteam = 1; } + */ + CheckAllowedTeams(); + if(dteam == 3 && c3 < 0) + dteam = 2; + if(dteam == 4 && c4 < 0) + dteam = 1; + // not changing teams if(scolor == dcolor) diff --git a/data/qcsrc/server/gamec/w_electro.c b/data/qcsrc/server/gamec/w_electro.c index 8260c75e8..951288094 100644 --- a/data/qcsrc/server/gamec/w_electro.c +++ b/data/qcsrc/server/gamec/w_electro.c @@ -116,7 +116,7 @@ void() W_Electro_Attack2 { local entity proj; - W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire.ogg"); + W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire2.ogg"); proj = spawn (); proj.classname = "plasma"; -- 2.39.2