r2959 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Nov 15 13:51:31 EST 2007


Author: div0
Date: 2007-11-15 13:51:31 -0500 (Thu, 15 Nov 2007)
New Revision: 2959

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/g_hook.qc
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/sv_main.qc
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/qcsrc/server/teamplay.qc
   trunk/data/qcsrc/server/w_nex.qc
   trunk/data/qcsrc/server/w_rocketlauncher.qc
   trunk/data/qcsrc/server/w_uzi.qc
Log:
latch the mutator cvars too


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -944,7 +944,7 @@
 
 void player_powerups (void)
 {
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		self.effects = EF_FULLBRIGHT;
 		if (self.items & IT_STRENGTH)
@@ -1032,7 +1032,7 @@
 	// first damage in the frame, leaving the player vulnerable to the
 	// remaining hits in the same frame)
 	if (self.flags & FL_ONGROUND)
-	if (cvar("g_midair"))
+	if (g_midair)
 		self.spawnshieldtime = max(self.spawnshieldtime, time + cvar("g_midair_shieldtime"));
 
 	if (time < self.spawnshieldtime)
@@ -1057,7 +1057,7 @@
 	limith = cvar("g_balance_health_limit");
 	limita = cvar("g_balance_armor_limit");
 
-	if (cvar("g_minstagib") || (g_lms && !cvar("g_lms_regenerate")))
+	if (g_minstagib || (g_lms && !cvar("g_lms_regenerate")))
 		return;
 
 	max_mod = regen_mod = rot_mod = limit_mod = 1;
@@ -1459,7 +1459,7 @@
 			zoomdir = self.button4;
 			if(self.button3)
 				if(self.weapon == WEP_NEX)
-					if(!cvar("g_minstagib"))
+					if(!g_minstagib)
 						zoomdir = 1;
 
 			if(zoomdir)
@@ -1497,7 +1497,7 @@
 		player_regen();
 		player_anim();
 
-		if (cvar("g_minstagib"))
+		if (g_minstagib)
 			minstagib_ammocheck();
 
 		ctf_setstatus();

Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -85,8 +85,8 @@
 		if(self.deadflag == DEAD_NO)
 		{
 			if (self.weapon != WEP_LASER
-				&& !cvar("g_minstagib") && !cvar("g_instagib")
-				&& !cvar("g_rocketarena") && !g_lms && cvar("g_pickup_items") && !cvar("g_nixnex"))
+				&& !g_minstagib && !g_instagib
+				&& !g_rocketarena && !g_lms && cvar("g_pickup_items") && !g_nixnex)
 				W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750), '0 0 0', TRUE);
 		}
 	}

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_physics.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -64,7 +64,7 @@
 		}
 	}
 
-	if(cvar("g_minstagib") && (self.items & IT_INVINCIBLE))
+	if(g_minstagib && (self.items & IT_INVINCIBLE))
 	{
 		mjumpheight = mjumpheight * cvar("g_balance_rune_speed_jumpheight");
 	}
@@ -172,7 +172,7 @@
 		}
 	}
 
-	if(cvar("g_minstagib") && (self.items & IT_INVINCIBLE))
+	if(g_minstagib && (self.items & IT_INVINCIBLE))
 	{
 		maxspd_mod = cvar("g_balance_rune_speed_moverate");
 	}

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_player.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -125,7 +125,7 @@
 void SpawnThrownWeapon (vector org, float w)
 {
 	if (!cvar("g_pickup_items"))
-	if (!cvar("g_minstagib"))
+	if (!g_minstagib)
 		return;
 	if (!w)
 		return;
@@ -240,7 +240,7 @@
 	if(numspawned < 2)
 		return;
 
-	if (!cvar("g_minstagib"))
+	if (!g_minstagib)
 	{
 		save = bound(0, damage * cvar("g_balance_armor_blockpercent"), self.armorvalue);
 		take = bound(0, damage - save, damage);

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -293,11 +293,11 @@
 {
 	float numberof, id;
 	numberof = WEP_LAST - WEP_FIRST; // all but the current one
-	if(cvar("g_nixnex_with_laser"))
+	if(g_nixnex_with_laser)
 		numberof = numberof - 1;
 	id = WEP_FIRST + ceil(random() * numberof) - 1;
 
-	if(cvar("g_nixnex_with_laser")) // skip the laser if needed
+	if(g_nixnex_with_laser) // skip the laser if needed
 		id = id + 1;
 
 	if(id >= nixnex_weapon) // skip the current weapon
@@ -320,7 +320,7 @@
 void Nixnex_GiveCurrentWeapon()
 {
 	float dt;
-	if(cvar("g_nixnex"))
+	if(g_nixnex)
 	{
 		if(!nixnex_nextweapon)
 			Nixnex_ChooseNextWeapon();
@@ -375,7 +375,7 @@
 		}
 
 		self.items = self.items - (self.items & (IT_LASER | IT_SHOTGUN | IT_UZI | IT_GRENADE_LAUNCHER | IT_ELECTRO | IT_CRYLINK | IT_NEX | IT_HAGAR | IT_ROCKET_LAUNCHER));
-		if(cvar("g_nixnex_with_laser"))
+		if(g_nixnex_with_laser)
 			self.items = self.items | IT_LASER;
 		self.items = self.items | W_ItemCode(nixnex_weapon);
 

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -60,14 +60,14 @@
 		}
 	}
 
-	if (!cvar("g_norecoil"))
+	if (!g_norecoil)
 		self.punchangle_x = recoil * -1;
 
 	if (snd != "")
 		sound (self, CHAN_WEAPON, snd, 1, ATTN_NORM);
 
 	if (self.items & IT_STRENGTH)
-	if (!cvar("g_minstagib"))
+	if (!g_minstagib)
 		sound (self, CHAN_AUTO, "weapons/strength_fire.wav", 1, ATTN_NORM);
 };
 
@@ -79,7 +79,7 @@
 	uselaser = 0;
 
 	// list of weapons that will use the laser, and the options that enable it
-	if(self.owner.laser_on && self.owner.weapon == WEP_ROCKET_LAUNCHER && cvar("g_laserguided_missile"))
+	if(self.owner.laser_on && self.owner.weapon == WEP_ROCKET_LAUNCHER && g_laserguided_missile)
 		uselaser = 1;
 	// example
 	//if(self.owner.weapon == WEP_ELECTRO && cvar("g_laserguided_electro"))

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/defs.qh	2007-11-15 18:51:31 UTC (rev 2959)
@@ -1,6 +1,7 @@
 // Globals
 
 float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms;
+float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire;
 
 float sv_cheats;
 

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/g_damage.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -180,7 +180,7 @@
 				{
 					checkrules_firstblood = TRUE;
 					//sound(world, CHAN_AUTO, "announcer/firstblood.wav", 1, ATTN_NONE);
-					//if (cvar("g_minstagib"))
+					//if (g_minstagib)
 						//sound(world, CHAN_AUTO, "announce/male/mapkill1.wav", 1, ATTN_NONE);
 					bprint("^1",a, "^1 drew first blood", "\n");
 				}
@@ -369,7 +369,7 @@
 					{
 						mirrordamage = cvar("g_mirrordamage") * damage;
 						mirrorforce = cvar("g_mirrordamage") * vlen(force);
-						if(cvar("g_minstagib"))
+						if(g_minstagib)
 						{
 							if(cvar("g_friendlyfire") == 0)
 								damage = 0;
@@ -400,7 +400,7 @@
 		if(attacker)
 			attacker.hitsound += 1;
 
-		if (cvar("g_minstagib"))
+		if (g_minstagib)
 		{
 			if ((deathtype == DEATH_FALL)  ||
 				(deathtype == DEATH_DROWN) ||
@@ -440,13 +440,13 @@
 		}
 
 		// apply strength multiplier
-		if (attacker.items & IT_STRENGTH && !cvar("g_minstagib"))
+		if (attacker.items & IT_STRENGTH && !g_minstagib)
 		{
 			damage = damage * cvar("g_balance_powerup_strength_damage");
 			force = force * cvar("g_balance_powerup_strength_force");
 		}
 		// apply invincibility multiplier
-		if (targ.items & IT_INVINCIBLE && !cvar("g_minstagib"))
+		if (targ.items & IT_INVINCIBLE && !g_minstagib)
 			damage = damage * cvar("g_balance_powerup_invincible_takedamage");
 
 
@@ -499,7 +499,7 @@
 	if(targ.classname == "player" && attacker.classname == "player" && attacker != targ && attacker.health > 2)
 	{
 		// Savage: vampire mode
-		if(cvar("g_vampire") && !cvar("g_minstagib"))
+		if(g_vampire && !g_minstagib)
 		{
 			attacker.health += damage;
 		}
@@ -541,7 +541,7 @@
 	if(mirrordamage > 0 || mirrorforce > 0)
 	{
 		attacker = attacker_save;
-		if(cvar("g_minstagib"))
+		if(g_minstagib)
 			if(mirrordamage > 0)
 			{
 				// just lose extra LIVES, don't kill the player for mirror damage

Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/g_hook.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -246,7 +246,7 @@
 void GrapplingHookFrame()
 {
 	// this function has been modified for Nexuiz
-	if (self.button6 && cvar("g_grappling_hook"))
+	if (self.button6 && g_grappling_hook)
 	{
 		if (!self.hook && self.hook_time <= time && !self.button6_pressed_before)
 			FireGrapplingHook();
@@ -263,7 +263,7 @@
 	{
 		self.movetype = MOVETYPE_WALK;
 	}
-	if(self.impulse == GRAPHOOK_FIRE && self.hook_time <= time && cvar("g_grappling_hook"))
+	if(self.impulse == GRAPHOOK_FIRE && self.hook_time <= time && g_grappling_hook)
 	{
 		// fire hook
 		FireGrapplingHook();

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/g_world.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -13,7 +13,7 @@
 		default_player_alpha = -1;
 		default_weapon_alpha = +1;
 	}
-	else if(cvar("g_cloaked"))
+	else if(g_cloaked)
 	{
 		default_player_alpha = cvar("g_balance_cloaked_alpha");
 		default_weapon_alpha = default_player_alpha;
@@ -129,7 +129,7 @@
 		//precache_model("models/player/visitant.zym");
 	}
 
-	if (cvar("g_footsteps"))
+	if (g_footsteps)
 	{
 		precache_sound ("misc/footstep01.wav");
 		precache_sound ("misc/footstep02.wav");
@@ -187,7 +187,7 @@
 	precache_sound ("announcer/robotic/1minuteremains.wav");
 	precache_sound ("announcer/robotic/2fragsleft.wav");
 	precache_sound ("announcer/robotic/3fragsleft.wav");
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		precache_sound ("announcer/robotic/lastsecond.wav");
 		precache_sound ("announcer/robotic/narrowly.wav");
@@ -206,13 +206,13 @@
 	// common weapon precaches
 	precache_sound ("weapons/weapon_switch.wav");
 	precache_sound ("weapons/weaponpickup.wav");
-	if (cvar("g_grappling_hook"))
+	if (g_grappling_hook)
 	{
 		precache_sound ("weapons/hook_fire.wav"); // hook
 		precache_sound ("weapons/hook_impact.wav"); // hook
 	}
 
-	if (cvar("sv_precacheweapons") || cvar("g_nixnex"))
+	if (cvar("sv_precacheweapons") || g_nixnex)
 	{
 		//precache weapon models/sounds
 		local float wep;
@@ -311,27 +311,27 @@
 		s = strcat(s, ftos(random()));
 		GameLogEcho(strcat(":gamestart:", GetMapname(), ":", s), FALSE);
 		s = ":gameinfo:mutators:LIST";
-		if(cvar("g_grappling_hook"))
+		if(g_grappling_hook)
 			s = strcat(s, ":grappling_hook");
 		if(!cvar("g_use_ammunition"))
 			s = strcat(s, ":no_use_ammunition");
 		if(!cvar("g_pickup_items"))
 			s = strcat(s, ":no_pickup_items");
-		if(cvar("g_instagib"))
+		if(g_instagib)
 			s = strcat(s, ":instagib");
-		if(cvar("g_rocketarena"))
+		if(g_rocketarena)
 			s = strcat(s, ":rockerarena");
-		if(cvar("g_nixnex"))
+		if(g_nixnex)
 			s = strcat(s, ":nixnex");
-		if(cvar("g_vampire"))
+		if(g_vampire)
 			s = strcat(s, ":vampire");
-		if(cvar("g_laserguided_missile"))
+		if(g_laserguided_missile)
 			s = strcat(s, ":laserguided_missile");
-		if(cvar("g_norecoil"))
+		if(g_norecoil)
 			s = strcat(s, ":norecoil");
-		if(cvar("g_midair"))
+		if(g_midair)
 			s = strcat(s, ":midair");
-		if(cvar("g_minstagib"))
+		if(g_minstagib)
 			s = strcat(s, ":minstagib");
 		GameLogEcho(s, FALSE);
 		GameLogEcho(":gameinfo:end", FALSE);

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -687,6 +687,19 @@
 
 void readlevelcvars(void)
 {
+	g_cloaked = cvar("g_cloaked");
+	g_footsteps = cvar("g_footsteps");
+	g_grappling_hook = cvar("g_grappling_hook");
+	g_instagib = cvar("g_instagib");
+	g_laserguided_missile = cvar("g_laserguided_missile");
+	g_midair = cvar("g_midair");
+	g_minstagib = cvar("g_minstagib");
+	g_nixnex = cvar("g_nixnex");
+	g_nixnex_with_laser = cvar("g_nixnex_with_laser");
+	g_norecoil = cvar("g_norecoil");
+	g_rocketarena = cvar("g_rocketarena");
+	g_vampire = cvar("g_vampire");
+
 	g_pickup_shells                    = cvar("g_pickup_shells");
 	g_pickup_shells_max                = cvar("g_pickup_shells_max");
 	g_pickup_nails                     = cvar("g_pickup_nails");
@@ -716,26 +729,26 @@
 	start_health = cvar("g_balance_health_start");
 	start_armorvalue = cvar("g_balance_armor_start");
 
-	if(cvar("g_instagib"))
+	if(g_instagib)
 	{
 		start_items = IT_NEX;
 		start_switchweapon = WEP_NEX;
 		weapon_action(start_switchweapon, WR_PRECACHE);
 		start_ammo_cells = 999;
 	}
-	else if(cvar("g_rocketarena"))
+	else if(g_rocketarena)
 	{
 		start_items = IT_ROCKET_LAUNCHER;
 		start_switchweapon = WEP_ROCKET_LAUNCHER;
 		weapon_action(start_switchweapon, WR_PRECACHE);
 		start_ammo_rockets = 999;
 	}
-	else if(cvar("g_nixnex"))
+	else if(g_nixnex)
 	{
 		start_items = 0;
 		// will be done later
 	}
-	else if(cvar("g_minstagib"))
+	else if(g_minstagib)
 	{
 		start_health = 100;
 		start_armorvalue = 0;

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/sv_main.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -104,7 +104,7 @@
 			}
 
 			// play stupid sounds
-			if (cvar("g_footsteps"))
+			if (g_footsteps)
 			if (!gameover)
 			if (self.flags & FL_ONGROUND)
 			if (vlen(self.velocity) > sv_maxspeed * 0.6)

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/t_items.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -45,7 +45,7 @@
 	pickedup = FALSE;
 	_switchweapon = FALSE;
 
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		_switchweapon = TRUE;
 		if (self.ammo_cells)
@@ -304,7 +304,7 @@
 		itemsInMap |= itemid;
 	}
 
-	if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") &&
+	if (!(cvar("g_pickup_items") && !g_nixnex) && !g_minstagib &&
 			itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemid != IT_HEALTH)
 	{
 		startitem_failed = TRUE;
@@ -312,7 +312,7 @@
 		return;
 	}
 
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		// don't remove dropped items and powerups
 		if (self.classname != "droppedweapon" &&
@@ -331,7 +331,7 @@
 		return;
 	}
 
-	if(cvar("g_instagib") || cvar("g_rocketarena"))
+	if(g_instagib || g_rocketarena)
 	{
 		startitem_failed = TRUE;
 		remove(self);
@@ -534,7 +534,7 @@
 void weapon_nex (void)
 {
 	float nextime;
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		minstagib_items(IT_CELLS);
 		self.think = minst_remove_item;
@@ -564,7 +564,7 @@
 
 void weapon_rocketlauncher (void)
 {
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		minstagib_items(IT_CELLS);
 		self.think = minst_remove_item;
@@ -641,7 +641,7 @@
 	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
-	if(cvar("g_minstagib")) {
+	if(g_minstagib) {
 		minstagib_items(IT_NAILS);
 	} else {
 		if(!self.max_health)
@@ -659,7 +659,7 @@
 	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
-	if(cvar("g_minstagib")) {
+	if(g_minstagib) {
 		minstagib_items(IT_STRENGTH);
 	} else {
 		precache_sound("weapons/strength_fire.wav");
@@ -675,7 +675,7 @@
 	if(g_arena && !cvar("g_arena_powerups"))
 		return;
 
-	if(cvar("g_minstagib")) {
+	if(g_minstagib) {
 		minstagib_items(IT_INVINCIBLE);
 	} else {
 		self.invincible_finished = 30;
@@ -687,7 +687,7 @@
 //void item_slowmo (void) {self.slowmo_finished = 30;StartItem ("models/items/g_slowmo.md3", "misc/powerup.wav", 120, "Slow Motion", IT_SLOWMO, FL_POWERUP, generic_pickupevalfunc, 10000);}
 
 void item_minst_cells (void) {
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 	{
 		minst_no_auto_cells = 1;
 		minstagib_items(IT_CELLS);

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/teamplay.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -162,7 +162,7 @@
 		gamemode_name = "Capture the Flag";
 		teams_matter = 1;
 	}
-	else if((game == GAME_RUNEMATCH || cvar("g_runematch")) && !cvar("g_minstagib"))
+	else if((game == GAME_RUNEMATCH || cvar("g_runematch")) && !g_minstagib)
 	{
 		game = GAME_RUNEMATCH;
 		cvar_set("g_runematch", "1");
@@ -298,17 +298,17 @@
 		kh_init();
 
 	// those mutators rule each other out
-	if(cvar("g_minstagib"))
+	if(g_minstagib)
 	{
 		cvar_set("g_instagib", "0");
 		cvar_set("g_rocketarena", "0");
 	}
-	if(cvar("g_instagib"))
+	if(g_instagib)
 	{
 		cvar_set("g_minstagib", "0");
 		cvar_set("g_rocketarena", "0");
 	}
-	if(cvar("g_rocketarena"))
+	if(g_rocketarena)
 	{
 		cvar_set("g_instagib", "0");
 		cvar_set("g_minstagib", "0");
@@ -382,29 +382,29 @@
 	}
 
 
-	if(cvar("g_minstagib"))
+	if(g_minstagib)
 		mutator = "^2Minstagib ^1";
-	else if(cvar("g_instagib"))
+	else if(g_instagib)
 		mutator = "^2Instagib ^1";
-	else if(cvar("g_rocketarena"))
+	else if(g_rocketarena)
 		mutator = "^2Rocketarena ^1";
-	else if(cvar("g_nixnex"))
+	else if(g_nixnex)
 		mutator = "^2No Items Nexuiz ^1";
 
-	if(cvar("g_midair")) {
+	if(g_midair) {
 		// to protect against unheedingly made changes
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
 		}
 		modifications = "midair";
 	}
-	if(cvar("g_vampire")) {
+	if(g_vampire) {
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
 		}
 		modifications = strcat(modifications, "vampire");
 	}
-	if(cvar("g_laserguided_missile")) {
+	if(g_laserguided_missile) {
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
 		}
@@ -439,7 +439,7 @@
 
 	s = strzone(s);
 
-	if (cvar("g_grappling_hook"))
+	if (g_grappling_hook)
 		s = strcat(s, "\n\n^8grappling hook is enabled, press 'e' to use it\n");
 
 	if (cvar_string("_mutatormsg") != "") {

Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/w_nex.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -5,7 +5,7 @@
 	W_SetupShot (self, '5 14 -8', TRUE, 5, "weapons/nexfire.wav");
 
 	// assure that nexdamage is high enough in minstagib
-	if (cvar("g_minstagib"))
+	if (g_minstagib)
 		FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 1000, 800, IT_NEX);
 	else
 		FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), IT_NEX);
@@ -31,9 +31,9 @@
 	// play a sound
 	PointSound (trace_endpos, "weapons/neximpact.wav", 1, ATTN_NORM);
 
-	if (cvar("g_use_ammunition") && !cvar("g_instagib"))
+	if (cvar("g_use_ammunition") && !g_instagib)
 	{
-		if (cvar("g_minstagib"))
+		if (g_minstagib)
 			self.ammo_cells = self.ammo_cells - 1;
 		else
 			self.ammo_cells = self.ammo_cells - cvar("g_balance_nex_ammo");
@@ -143,7 +143,7 @@
 	{
 		if (self.button0)
 		{
-			if(cvar("g_minstagib"))
+			if(g_minstagib)
 			{
 				if (weapon_prepareattack(0, cvar("g_balance_minstagib_nex_refire")))
 				{
@@ -162,7 +162,7 @@
 		}
 		else if (self.button3)
 		{
-			if (cvar("g_minstagib"))
+			if (g_minstagib)
 			{
 				if (self.jump_interval <= time)
 				{
@@ -185,7 +185,7 @@
 		weapon_setup(WEP_NEX, "nex", IT_CELLS);
 	else if (req == WR_CHECKAMMO1)
 	{
-		if (cvar("g_minstagib"))
+		if (g_minstagib)
 			return self.ammo_cells >= 1;
 		else
 			return self.ammo_cells >= cvar("g_balance_nex_ammo");

Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -27,7 +27,7 @@
 			ATTACK_FINISHED(self.owner) = time;
 			self.owner.switchweapon = w_getbestweapon(self.owner);
 		}
-		if(cvar("g_laserguided_missile"))
+		if(g_laserguided_missile)
 			ATTACK_FINISHED(self.owner) = time + cvar("g_balance_rocketlauncher_refire");
 	}
 	remove (self);
@@ -97,7 +97,7 @@
 		return;
 	}
 
-	if(cvar("g_laserguided_missile"))
+	if(g_laserguided_missile)
 	{
 		// accelerate
 		makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0');
@@ -117,7 +117,7 @@
 	// laser guided, or remote detonation
 	if (self.owner.weapon == WEP_ROCKET_LAUNCHER)
 	{
-		if(cvar("g_laserguided_missile"))
+		if(g_laserguided_missile)
 		{
 			if(!self.owner.button0)
 				self.ltime = -1; // indicate that the player has let go of the button
@@ -201,7 +201,7 @@
 	local entity missile;
 	local entity flash, flash2;
 
-	if (cvar("g_use_ammunition") && !cvar("g_rocketarena"))
+	if (cvar("g_use_ammunition") && !g_rocketarena)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
 
 	W_SetupShot (self, '8 3 -8', FALSE, 5, "weapons/rocket_fire.wav");
@@ -225,7 +225,7 @@
 	setsize (missile, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
 
 	setorigin (missile, w_shotorg);
-	if(cvar("g_laserguided_missile") && self.laser_on)
+	if(g_laserguided_missile && self.laser_on)
 		missile.velocity = w_shotdir * cvar("g_balance_rocketlauncher_laserguided_speedstart");
 	else
 		missile.velocity = w_shotdir * cvar("g_balance_rocketlauncher_speedstart");
@@ -378,7 +378,7 @@
 			sound (self, CHAN_BODY, "weapons/rocket_det.wav", 0.5, ATTN_NORM);
 		}
 		if (self.button3)
-		if(cvar("g_laserguided_missile"))
+		if(g_laserguided_missile)
 		if(self.exteriorweaponentity.attack_finished_single < time)
 		{
 			self.exteriorweaponentity.attack_finished_single = time + 0.4;
@@ -397,7 +397,7 @@
 		precache_sound ("weapons/rocket_fire.wav");
 		precache_sound ("weapons/rocket_fly.wav");
 		precache_sound ("weapons/rocket_impact.wav");
-		if (cvar("g_laserguided_missile"))
+		if (g_laserguided_missile)
 			precache_model ("models/laser_dot.mdl"); // rocket launcher
 	}
 	else if (req == WR_SETUP)

Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc	2007-11-15 18:43:45 UTC (rev 2958)
+++ trunk/data/qcsrc/server/w_uzi.qc	2007-11-15 18:51:31 UTC (rev 2959)
@@ -11,7 +11,7 @@
 			self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_sustained_ammo");
 	}
 	W_SetupShot (self, '11 5.5 -8', TRUE, 0, "weapons/uzi_fire.wav");
-	if (!cvar("g_norecoil"))
+	if (!g_norecoil)
 	{
 		self.punchangle_x = random () - 0.5;
 		self.punchangle_y = random () - 0.5;




More information about the nexuiz-commits mailing list