r2958 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Nov 15 13:43:46 EST 2007
Author: div0
Date: 2007-11-15 13:43:45 -0500 (Thu, 15 Nov 2007)
New Revision: 2958
Modified:
trunk/data/qcsrc/server/bots.qc
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_impulse.qc
trunk/data/qcsrc/server/cl_player.qc
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/havocbot_roles.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/mode_onslaught.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
made cvars like g_ctf only be queried once on startup
Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/bots.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -2149,7 +2149,7 @@
FOR_EACH_REALCLIENT(head)
{
- if(head.classname == "player" || cvar("g_lms") || cvar("g_arena"))
+ if(head.classname == "player" || g_lms || g_arena)
++activerealplayers;
++realplayers;
}
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/cl_client.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -141,7 +141,7 @@
teamcheck = 0;
- if(!anypoint && (cvar("g_ctf") || cvar("g_assault")))
+ if(!anypoint && (g_ctf || g_assault))
teamcheck = self.team;
// get the list of players
@@ -313,7 +313,7 @@
DistributeFragsAmongTeam(self, self.team, 1);
- if(self.frags <= 0 && self.frags > -666 && cvar("g_lms") && self.killcount != -666)
+ if(self.frags <= 0 && self.frags > -666 && g_lms && self.killcount != -666)
bprint ("^4", self.netname, "^4 has no more lives left\n");
else if(self.killcount != -666)
bprint ("^4", self.netname, "^4 is spectating now\n");
@@ -372,7 +372,7 @@
self.oldvelocity = self.velocity;
self.customizeentityforclient = Client_customizeentityforclient;
- if(cvar("g_arena"))
+ if(g_arena)
{
if(self.frags != -2)
{
@@ -384,7 +384,7 @@
Spawnqueue_Remove(self);
}
}
- else if(!cvar("g_lms"))
+ else if(!g_lms)
self.frags = -666;
}
@@ -410,10 +410,10 @@
}
// player is dead and becomes observer
- if(cvar("g_lms") && self.frags < 1)
+ if(g_lms && self.frags < 1)
self.classname = "observer";
- if(cvar("g_arena"))
+ if(g_arena)
if(!self.spawned)
self.classname = "observer";
@@ -522,7 +522,7 @@
// don't reset back to last position, even if new position is stuck in solid
self.oldorigin = self.origin;
- if(cvar("g_arena"))
+ if(g_arena)
{
Spawnqueue_Remove(self);
Spawnqueue_Mark(self);
@@ -537,8 +537,8 @@
if(self.killcount == -666) {
self.killcount = 0;
- if(!cvar("g_arena"))
- if(!cvar("g_lms"))
+ if(!g_arena)
+ if(!g_lms)
self.frags = 0;
}
@@ -564,7 +564,7 @@
if (cvar("g_spawnsound"))
sound (self, CHAN_AUTO, "misc/spawn.wav", 1, ATTN_NORM);
- if(cvar("g_assault")) {
+ if(g_assault) {
if(self.team == assault_attacker_team)
centerprint(self, "You are attacking!\n");
else
@@ -677,7 +677,7 @@
//JoinBestTeam(self, FALSE);
- if((cvar("sv_spectate") == 1 && !cvar("g_lms")) || cvar("g_campaign")) {
+ if((cvar("sv_spectate") == 1 && !g_lms) || cvar("g_campaign")) {
self.classname = "observer";
} else {
self.classname = "player";
@@ -702,7 +702,7 @@
bprint ("^4",self.netname);
bprint ("^4 connected");
- if(cvar("g_domination") || cvar("g_ctf"))
+ if(cvar("g_domination") || g_ctf)
{
bprint(" and joined the ");
bprint(ColoredTeamName(self.team));
@@ -753,7 +753,7 @@
else
stuffcmd(self, "set teamplay 0\n");
- if(cvar("g_lms"))
+ if(g_lms)
{
self.frags = cvar("fraglimit");
// no fraglimit was set, so player gets 999 lives
@@ -766,7 +766,7 @@
self.frags = -666;
}
}
- else if(cvar("g_arena"))
+ else if(g_arena)
{
self.classname = "observer";
Spawnqueue_Insert(self);
@@ -827,7 +827,7 @@
if(self.weaponentity.lasertarget)
remove(self.weaponentity.lasertarget);
- if(cvar("g_arena"))
+ if(g_arena)
{
Spawnqueue_Unmark(self);
Spawnqueue_Remove(self);
@@ -1057,7 +1057,7 @@
limith = cvar("g_balance_health_limit");
limita = cvar("g_balance_armor_limit");
- if (cvar("g_minstagib") || (cvar("g_lms") && !cvar("g_lms_regenerate")))
+ if (cvar("g_minstagib") || (g_lms && !cvar("g_lms_regenerate")))
return;
max_mod = regen_mod = rot_mod = limit_mod = 1;
@@ -1294,7 +1294,7 @@
if(self.button7)
PrintWelcomeMessage(self);
- if(cvar("g_lms") || !cvar("sv_spectate"))
+ if(g_lms || !cvar("sv_spectate"))
if((time - self.jointime) <= cvar("welcome_message_time"))
PrintWelcomeMessage(self);
@@ -1321,7 +1321,7 @@
float button_pressed, force_respawn;
player_anim();
button_pressed = (self.button0 || self.button2 || self.button3 || self.button6 || self.buttonuse);
- force_respawn = (cvar("g_lms") || cvar("g_forced_respawn"));
+ force_respawn = (g_lms || cvar("g_forced_respawn"));
if (self.deadflag == DEAD_DYING)
{
if(force_respawn)
@@ -1348,7 +1348,7 @@
return;
}
- if(cvar("g_lms") && !self.deadflag && cvar("g_lms_campcheck_interval"))
+ if(g_lms && !self.deadflag && cvar("g_lms_campcheck_interval"))
{
vector dist;
Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/cl_impulse.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -86,7 +86,7 @@
{
if (self.weapon != WEP_LASER
&& !cvar("g_minstagib") && !cvar("g_instagib")
- && !cvar("g_rocketarena") && !cvar("g_lms") && cvar("g_pickup_items") && !cvar("g_nixnex"))
+ && !cvar("g_rocketarena") && !g_lms && cvar("g_pickup_items") && !cvar("g_nixnex"))
W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750), '0 0 0', TRUE);
}
}
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/cl_player.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -236,7 +236,7 @@
self.v_angle_y = self.v_angle_y + (random() * 2 - 1) * shake;
}
- if(cvar("g_arena"))
+ if(g_arena)
if(numspawned < 2)
return;
@@ -396,7 +396,7 @@
//WriteAngle (MSG_ONE, 80);
}
- if(cvar("g_arena"))
+ if(g_arena)
Spawnqueue_Unmark(self);
}
}
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/clientcommands.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -375,7 +375,7 @@
} else if(argv(0) == "sentcvar") { // new system
GetCvars(1);
} else if(argv(0) == "spectate") {
- if(cvar("g_lms") || cvar("g_arena"))
+ if(g_lms || g_arena)
return; // don't allow spectating in lms, unless player runs out of lives
if(self.classname == "player" && cvar("sv_spectate") == 1) {
if(self.flagcarried)
@@ -387,7 +387,7 @@
PutClientInServer();
}
} else if(argv(0) == "join") {
- if(!cvar("g_arena"))
+ if(!g_arena)
if (self.classname != "player")
{
self.classname = "player";
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/ctf.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -395,7 +395,7 @@
void() item_flag_team1 =
{
- if (!cvar("g_ctf"))
+ if (!g_ctf)
return;
//if(!cvar("teamplay"))
// cvar_set("teamplay", "3");
@@ -451,7 +451,7 @@
void() item_flag_team2 =
{
- if (!cvar("g_ctf"))
+ if (!g_ctf)
return;
//if(!cvar("teamplay"))
// cvar_set("teamplay", "3");
@@ -597,7 +597,7 @@
self.items = self.items - (self.items & IT_BLUE_FLAG_TAKEN);
self.items = self.items - (self.items & IT_BLUE_FLAG_LOST);
- if (cvar("g_ctf")) {
+ if (g_ctf) {
local entity flag;
flag = find(world, classname, "item_flag_team1");
ctf_setstatus2(flag);
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/defs.qh 2007-11-15 18:43:45 UTC (rev 2958)
@@ -1,5 +1,7 @@
// Globals
+float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms;
+
float sv_cheats;
entity activator;
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/g_damage.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -11,7 +11,7 @@
{
if(gameover) return;
- if(cvar("g_arena"))
+ if(g_arena)
if(cvar("g_arena_roundbased"))
return;
@@ -26,11 +26,11 @@
if(f > 0)
f = RunematchHandleFrags(attacker, targ, f);
}
- else if(cvar("g_keyhunt"))
+ else if(g_keyhunt)
{
f = kh_HandleFrags(attacker, targ, f);
}
- else if(cvar("g_lms"))
+ else if(g_lms)
{
// count remaining lives, not frags in lms
targ.frags -= 1;
@@ -384,7 +384,7 @@
}
}
- if(cvar("g_lms"))
+ if(g_lms)
if(targ.classname == "player")
if(attacker.classname == "player")
if(attacker != targ)
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/g_world.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -1649,15 +1649,15 @@
}
status = WINNING_NO;
- if(cvar("g_assault"))
+ if(g_assault)
{
status = WinningCondition_Assault();
}
- else if(cvar("g_lms"))
+ else if(g_lms)
{
status = WinningCondition_LMS();
}
- else if (cvar("g_onslaught"))
+ else if (g_onslaught)
{
status = WinningCondition_Onslaught();
}
@@ -1665,7 +1665,7 @@
{
if(teams_matter)
{
- if(cvar("g_tdm") || cvar("g_runematch") || cvar("g_ctf") || cvar("g_domination") || cvar("g_keyhunt"))
+ if(g_tdm || cvar("g_runematch") || g_ctf || cvar("g_domination") || g_keyhunt)
status = WinningCondition_MaxTeamSum(fraglimit);
//else if()
// status = WinningCondition_MaxTeamMax(fraglimit);
Modified: trunk/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot_roles.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/havocbot_roles.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -709,11 +709,11 @@
dprint("choose a role...\n");
navigation_routetogoal(world);
self.bot_strategytime = -1;
- if (cvar("g_ctf"))
+ if (g_ctf)
havocbot_chooserole_ctf();
else if (cvar("g_domination"))
havocbot_chooserole_dom();
- else if (cvar("g_keyhunt"))
+ else if (g_keyhunt)
havocbot_chooserole_kh();
else // assume anything else is deathmatch
havocbot_chooserole_dm();
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -746,7 +746,7 @@
}
else
{
- if(cvar("g_lms"))
+ if(g_lms)
{
start_ammo_shells = cvar("g_lms_start_ammo_shells");
start_ammo_nails = cvar("g_lms_start_ammo_nails");
@@ -767,55 +767,55 @@
start_ammo_cells = cvar("g_pickup_cells_max");
}
- if (cvar("g_start_weapon_laser") || cvar("g_lms"))
+ if (cvar("g_start_weapon_laser") || g_lms)
{
start_items = start_items | IT_LASER;
start_switchweapon = WEP_LASER;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_shotgun") || cvar("g_lms"))
+ if (cvar("g_start_weapon_shotgun") || g_lms)
{
start_items = start_items | IT_SHOTGUN;
start_switchweapon = WEP_SHOTGUN;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_uzi") || cvar("g_lms"))
+ if (cvar("g_start_weapon_uzi") || g_lms)
{
start_items = start_items | IT_UZI;
start_switchweapon = WEP_UZI;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_grenadelauncher") || cvar("g_lms"))
+ if (cvar("g_start_weapon_grenadelauncher") || g_lms)
{
start_items = start_items | IT_GRENADE_LAUNCHER;
start_switchweapon = WEP_GRENADE_LAUNCHER;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_electro") || cvar("g_lms"))
+ if (cvar("g_start_weapon_electro") || g_lms)
{
start_items = start_items | IT_ELECTRO;
start_switchweapon = WEP_ELECTRO;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_crylink") || cvar("g_lms"))
+ if (cvar("g_start_weapon_crylink") || g_lms)
{
start_items = start_items | IT_CRYLINK;
start_switchweapon = WEP_CRYLINK;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_nex") || cvar("g_lms"))
+ if (cvar("g_start_weapon_nex") || g_lms)
{
start_items = start_items | IT_NEX;
start_switchweapon = WEP_NEX;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_hagar") || cvar("g_lms"))
+ if (cvar("g_start_weapon_hagar") || g_lms)
{
start_items = start_items | IT_HAGAR;
start_switchweapon = WEP_HAGAR;
weapon_action(start_switchweapon, WR_PRECACHE);
}
- if (cvar("g_start_weapon_rocketlauncher") || cvar("g_lms"))
+ if (cvar("g_start_weapon_rocketlauncher") || g_lms)
{
start_items = start_items | IT_ROCKET_LAUNCHER;
start_switchweapon = WEP_ROCKET_LAUNCHER;
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -227,7 +227,7 @@
*/
void() onslaught_generator =
{
- if (!cvar("g_onslaught"))
+ if (!g_onslaught)
{
remove(self);
return;
@@ -409,7 +409,7 @@
void() onslaught_controlpoint =
{
local entity e;
- if (!cvar("g_onslaught"))
+ if (!g_onslaught)
{
remove(self);
return;
@@ -465,7 +465,7 @@
*/
void() onslaught_link =
{
- if (!cvar("g_onslaught"))
+ if (!g_onslaught)
{
remove(self);
return;
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/t_items.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -324,7 +324,7 @@
}
}
- if(cvar("g_lms") && (self.classname != "droppedweapon"))
+ if(g_lms && (self.classname != "droppedweapon"))
{
startitem_failed = TRUE;
remove(self);
@@ -638,7 +638,7 @@
if(!cvar("g_powerup_superhealth"))
return;
- if(cvar("g_arena") && !cvar("g_arena_powerups"))
+ if(g_arena && !cvar("g_arena_powerups"))
return;
if(cvar("g_minstagib")) {
@@ -656,7 +656,7 @@
if(!cvar("g_powerup_strength"))
return;
- if(cvar("g_arena") && !cvar("g_arena_powerups"))
+ if(g_arena && !cvar("g_arena_powerups"))
return;
if(cvar("g_minstagib")) {
@@ -672,7 +672,7 @@
if(!cvar("g_powerup_shield"))
return;
- if(cvar("g_arena") && !cvar("g_arena_powerups"))
+ if(g_arena && !cvar("g_arena_powerups"))
return;
if(cvar("g_minstagib")) {
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2007-11-15 17:53:38 UTC (rev 2957)
+++ trunk/data/qcsrc/server/teamplay.qc 2007-11-15 18:43:45 UTC (rev 2958)
@@ -14,8 +14,6 @@
// # of bots on those teams
float cb1, cb2, cb3, cb4;
-float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault;
-
float audit_teams_time;
float() IsTeamBalanceForced = {
@@ -127,7 +125,7 @@
VoteReset();
- game = cvar ("gamecfg"); // load game options
+ game = cvar("gamecfg"); // load game options
// game cvars get reset before map changes
// then map's cfg sets them as desired
@@ -323,10 +321,12 @@
g_domination = cvar("g_domination");
g_ctf = cvar("g_ctf");
- g_assault = cvar("g_assault");
+ g_lms = cvar("g_lms");
g_tdm = cvar("g_tdm");
g_keyhunt = cvar("g_keyhunt");
g_onslaught = cvar("g_onslaught");
+ g_assault = cvar("g_assault");
+ g_arena = cvar("g_arena");
}
string GetClientVersionMessage(float v) {
@@ -368,14 +368,14 @@
if(self.classname == "observer")
{
- if(cvar("g_lms") && self.frags <= 0 && self.frags > -666)
+ if(g_lms && self.frags <= 0 && self.frags > -666)
return centerprint(self, strcat(NEWLINES, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
- else if(cvar("g_lms") && self.frags == -666)
+ else if(g_lms && self.frags == -666)
return centerprint(self, strcat(NEWLINES, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
}
else if(self.classname == "spectator")
{
- if ((cvar("g_lms") && self.frags < 1) || cvar("g_arena"))
+ if ((g_lms && self.frags < 1) || g_arena)
return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
else
return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
@@ -421,7 +421,7 @@
s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
if((self.classname == "observer" || self.classname == "spectator") && self.version == cvar("gameversion")) {
- if(!cvar("g_arena"))
+ if(!g_arena)
s = strcat(s,"^7\n\n\npress jump to play\npress attack to spectate other players\n\n");
else if(player_count < 2 && arena_roundbased)
{
@@ -825,7 +825,7 @@
// find out what teams are available
CheckAllowedTeams(pl);
- if(cvar("g_domination"))
+ if(g_domination)
{
if(cvar("g_domination_default_teams") < 3)
c3 = 999999999;
@@ -924,26 +924,6 @@
else if(dcolor == COLOR_TEAM4 - 1)
dteam = 4;
- // remap invalid teams in dom & ctf
- /*
- if(cvar("g_ctf") && dteam == 3)
- dteam = 2;
- else if(cvar("g_ctf") && dteam == 4)
- dteam = 1;
- else if((cvar("g_domination") && cvar("g_domination_default_teams") < 3) || (cvar("g_tdm") && cvar("g_tdm_teams") < 3))
- {
- if(dteam == 3)
- dteam = 2;
- else if(dteam == 4)
- dteam = 1;
- }
- else if((cvar("g_domination") && cvar("g_domination_default_teams") < 4) || (cvar("g_tdm") && cvar("g_tdm_teams") < 4))
- {
- if(dteam == 4)
- dteam = 1;
- }
- */
-
CheckAllowedTeams(self);
if(dteam == 1 && c1 < 0) dteam = 4;
More information about the nexuiz-commits
mailing list