From a434de26f71a653c6eb131d546747a540177c7e3 Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sat, 17 Dec 2005 17:56:04 +0000 Subject: [PATCH] fixed some bugs with scoretransfer on teamchange added support for esteel's team scoreboard r_shadow_glsl is now safed in config.cfg fixed warnings git-svn-id: svn://svn.icculus.org/nexuiz/trunk@673 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 2 ++ data/gfx/net.tga | Bin 13677 -> 9081 bytes data/qcsrc/gamec/cl_client.c | 6 +++++ data/qcsrc/gamec/mauvebot.c | 6 +++++ data/qcsrc/gamec/runematch.c | 32 ++++++++++++------------- data/qcsrc/gamec/teamplay.c | 44 ++++++++++++++++++----------------- 6 files changed, 53 insertions(+), 37 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 1df1fe5e4..8fb7ea5b2 100755 --- a/data/default.cfg +++ b/data/default.cfg @@ -91,6 +91,7 @@ seta sv_spectate 1 seta sv_defaultcharacter 0 seta sv_defaultplayermodel models/player/nexus.zym seta sv_defaultplayerskin 0 +set net_messagetimeout 60 pausable 0 set bot_number 0 // number of bots in server @@ -334,6 +335,7 @@ r_dynamic 1 r_shadow_bumpscale_basetexture 5 r_shadow_realtime_world 1 r_shadow_realtime_world_lightmaps 1 +seta r_shadow_glsl 1 r_shadow_glsl_offsetmapping 0 r_shadow_realtime_world_shadows 0 r_shadow_realtime_dlight_shadows 0 diff --git a/data/gfx/net.tga b/data/gfx/net.tga index bbabb97a72e0e5ff6044977f5b991c93b47ca34c..c78898f546ce24e9a8afe2d3c8edce225c1a68ce 100644 GIT binary patch literal 9081 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 literal 13677 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 R{`rz+^;RX|=RY0czW`ptR51Vm diff --git a/data/qcsrc/gamec/cl_client.c b/data/qcsrc/gamec/cl_client.c index ca0b52368..210437aa4 100644 --- a/data/qcsrc/gamec/cl_client.c +++ b/data/qcsrc/gamec/cl_client.c @@ -536,6 +536,12 @@ void ClientConnect (void) // get version info from player stuffcmd(self, "cmd clientversion $g_nexuizversion_major\n"); + // set cvar for team scoreboard + if(teams_matter) + stuffcmd(self, "set teamplay 1\n"); + else + stuffcmd(self, "set teamplay 0\n"); + if(cvar("g_lms")) { self.frags = cvar("fraglimit"); diff --git a/data/qcsrc/gamec/mauvebot.c b/data/qcsrc/gamec/mauvebot.c index 70b1953af..dd0081283 100644 --- a/data/qcsrc/gamec/mauvebot.c +++ b/data/qcsrc/gamec/mauvebot.c @@ -124,6 +124,12 @@ string(float r) BotName = self.playerskin = "1"; return "Armored Carni"; } + else + { + self.playermodel = "models/player/carni.zym"; + self.playerskin = "0"; + return "Carni"; + } }; string () PickARandomName = diff --git a/data/qcsrc/gamec/runematch.c b/data/qcsrc/gamec/runematch.c index 5ea070cda..1b4e17969 100644 --- a/data/qcsrc/gamec/runematch.c +++ b/data/qcsrc/gamec/runematch.c @@ -65,30 +65,30 @@ string RuneName(float r) vector RuneColormod(float r) { - vector color; + vector _color; if(r == RUNE_STRENGTH) - color = '255 0 0'; + _color = '255 0 0'; if(r == RUNE_DEFENSE) - color = '0 0 255';//'0 102 255';// + _color = '0 0 255';//'0 102 255';// if(r == RUNE_REGEN) - color = '0 204 0';//'0 255 0'; + _color = '0 204 0';//'0 255 0'; if(r == RUNE_SPEED) - color = 0.35*'185 185 0';//255 230 0';//'255 255 0'; + _color = 0.35*'185 185 0';//255 230 0';//'255 255 0'; if(r == RUNE_VAMPIRE) - color = '64 0 128';//'108 0 217';//'128 0 255';//'179 0 204';// + _color = '64 0 128';//'108 0 217';//'128 0 255';//'179 0 204';// if(r == CURSE_WEAK) - color = '255 0 0'; + _color = '255 0 0'; if(r == CURSE_VULNER) - color = '0 0 255';//'0 102 255';// + _color = '0 0 255';//'0 102 255';// if(r == CURSE_VENOM) - color = '0 204 0';//'0 255 0'; + _color = '0 204 0';//'0 255 0'; if(r == CURSE_SLOW) - color = 0.5*'185 185 0';//'255 255 0'; + _color = 0.5*'185 185 0';//'255 255 0'; if(r == CURSE_EMPATHY) - color = '179 0 204';//'128 0 255'; + _color = '179 0 204';//'128 0 255'; - return color * (1 / 255) * cvar("g_runematch_rune_color_strength"); + return _color * (1 / 255) * cvar("g_runematch_rune_color_strength"); } float count_rune_spawnpoints() @@ -255,9 +255,9 @@ void rune_respawn() entity FindRune(entity own, string clname, float r) { entity rune; - float count, c; + float _count, c; - c = count = 0; + c = _count = 0; rune = world; do @@ -269,8 +269,8 @@ entity FindRune(entity own, string clname, float r) break; if(rune.owner == own) { - count = count + 1; - if(count >= r) + _count = _count + 1; + if(_count >= r) return rune; if(r <= 1) return rune; diff --git a/data/qcsrc/gamec/teamplay.c b/data/qcsrc/gamec/teamplay.c index 4619b9e19..4c21f2d09 100644 --- a/data/qcsrc/gamec/teamplay.c +++ b/data/qcsrc/gamec/teamplay.c @@ -291,7 +291,7 @@ void PrintWelcomeMessage(entity pl) } -void SetPlayerColors(entity pl, float color) +void SetPlayerColors(entity pl, float _color) { /*string s; s = ftos(cl); @@ -301,18 +301,18 @@ void SetPlayerColors(entity pl, float color) pl.clientcolors = 16*cl + cl;*/ if(teamplay) { - setcolor(pl, 16*color + color); + setcolor(pl, 16*_color + _color); } else { float shirt; shirt = pl.clientcolors & 0xF0; - setcolor(pl, shirt + color); + setcolor(pl, shirt + _color); } } void SetPlayerTeam(entity pl, float t, float s, float noprint) { - float color; + float _color; // remap invalid teams in dom & ctf if(cvar("g_ctf") && t == 3) @@ -333,26 +333,25 @@ void SetPlayerTeam(entity pl, float t, float s, float noprint) } if(t == 4) - color = COLOR_TEAM4 - 1; + _color = COLOR_TEAM4 - 1; else if(t == 3) - color = COLOR_TEAM3 - 1; + _color = COLOR_TEAM3 - 1; else if(t == 2) - color = COLOR_TEAM2 - 1; + _color = COLOR_TEAM2 - 1; else - color = COLOR_TEAM1 - 1; + _color = COLOR_TEAM1 - 1; + // kill player when changing teams + if(teams_matter && pl.classname == "player" && pl.deadflag == DEAD_NO && pl.team != (_color + 1)) + Damage(pl, pl, pl, 100000, DEATH_KILL, pl.origin, '0 0 0'); - SetPlayerColors(pl,color); + SetPlayerColors(pl,_color); if(!noprint && t != s) { //bprint(strcat(pl.netname, " has changed to ", TeamNoName(t), "\n")); bprint(strcat(pl.netname, "^7 has changed from ", TeamNoName(s), " to ", TeamNoName(t), "\n")); } - - // kill player when changing teams - if(teams_matter && self.classname == "player" && self.deadflag == DEAD_NO && (color + 1) != self.team) - Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0'); } @@ -409,19 +408,19 @@ void CheckAllowedTeams () { if(head.team == COLOR_TEAM1) { - c1 = 0; + c1 = 0; } if(head.team == COLOR_TEAM2) { - c2 = 0; + c2 = 0; } if(head.team == COLOR_TEAM3) { - c3 = 0; + c3 = 0; } if(head.team == COLOR_TEAM4) { - c4 = 0; + c4 = 0; } } head = find(head, classname, teament_name); @@ -642,23 +641,25 @@ float JoinBestTeam(entity pl, float only_return_best) SetPlayerColors(pl, COLOR_TEAM4 - 1); } else + { error("smallest team: invalid team\n"); + } } return smallest; } -void SV_ChangeTeam(float color) +void SV_ChangeTeam(float _color) { float scolor, dcolor, steam, dteam, dbotcount, scount, dcount; scolor = self.clientcolors & 0x0F; - dcolor = color & 0x0F; + dcolor = _color & 0x0F; // store shirt color in .clientcolors // this will get overwritten in teamplay modes later - setcolor(self, color & 0xF0 + scolor); + setcolor(self, _color & 0xF0 + scolor); if(scolor == COLOR_TEAM1 - 1) steam = 1; @@ -753,7 +754,8 @@ void SV_ChangeTeam(float color) } // reduce frags during a team change - self.frags = floor(self.frags * (cvar("g_changeteam_fragtransfer") / 100)); + if(teamplay && self.classname == "player" && self.team != (dcolor + 1)) + self.frags = floor(self.frags * (cvar("g_changeteam_fragtransfer") / 100)); // bprint(strcat("allow change teams from ", ftos(steam), " to ", ftos(dteam), "\n")); -- 2.39.2