r2472 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-03 17:15:40 -0400 (Thu, 03 May 2007)
New Revision: 2472

Modified:
   trunk/data/qcsrc/server/campaign.qc
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/gamecommand.qc
Log:
- sv_cheats now gets only read at startup (just like in the engine)
- fix impulse 99 (now give health and armor too, and does not clear item bits any more)
- campaign levelwarp now is "sv_cmd warp 10"


Modified: trunk/data/qcsrc/server/campaign.qc
===================================================================
--- trunk/data/qcsrc/server/campaign.qc	2007-05-03 20:17:02 UTC (rev 2471)
+++ trunk/data/qcsrc/server/campaign.qc	2007-05-03 21:15:40 UTC (rev 2472)
@@ -174,7 +174,7 @@
 
 void(float n) CampaignLevelWarp =
 {
-	if(!cvar("sv_cheats"))
+	if(!sv_cheats)
 		return;
 	CampaignFile_Unload();
 	CampaignFile_Load(n, 1);

Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2007-05-03 20:17:02 UTC (rev 2471)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2007-05-03 21:15:40 UTC (rev 2472)
@@ -77,39 +77,6 @@
 		else
 			self.impulse = imp; // retry in next frame
 	}
-	else if (imp >= 13 && imp <= 16)
-	{
-		if (cvar("sv_cheats"))
-		{
-			if (imp == 13 && self.deadflag == DEAD_NO)
-			{
-				makevectors (self.v_angle);
-				self.velocity = self.velocity + v_forward * 300;
-				CopyBody(1);
-				self.velocity = self.velocity - v_forward * 300;
-			}
-			else if (imp == 14 && self.deadflag == DEAD_NO)
-				CopyBody(0);
-			else if (imp == 15)
-			{
-				sprint(self, strcat("origin = ", vtos(self.origin), "\n"));
-				sprint(self, strcat("angles = ", vtos(self.angles), "\n"));
-			}
-			else if (imp == 16)
-			{
-				float i;
-				string s;
-				i=1;
-				while(i <= 10)
-				{
-					s = ftos(i);
-					sprint(self, strcat(s, ": ^", s, "color\n"));
-					i = i + 1;
-				}
-				sprint(self, strcat("origin = ", vtos(self.origin), "\n"));
-			}
-		}
-	}
 	// throw weapon
 	else if (imp == 17)
 	{
@@ -196,7 +163,7 @@
 	}
 	else
 	{
-		if (cvar("sv_cheats"))
+		if (sv_cheats)
 		{
 			if(imp == 19)
 			{
@@ -211,18 +178,28 @@
 				traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 65536, FALSE, self);
 				sprint(self, strcat("distance: ", ftos(fabs(vlen(trace_endpos - (self.origin + self.view_ofs)))), "\n"));
 			}
-			else if(imp == 6*9)
+			else if(self.deadflag == DEAD_NO)
 			{
-				CampaignLevelWarp(cvar("_warplevel"));
+				if(imp == 99)
+				{
+					self.items |= (IT_LASER | IT_UZI | IT_SHOTGUN | IT_GRENADE_LAUNCHER | IT_ELECTRO | IT_CRYLINK | IT_NEX | IT_HAGAR | IT_ROCKET_LAUNCHER);
+					self.ammo_shells = 999;
+					self.ammo_nails = 999;
+					self.ammo_rockets = 999;
+					self.ammo_cells = 999;
+					self.health = 999;
+					self.armorvalue = 999;
+				}
+				else if (imp == 13)
+				{
+					makevectors (self.v_angle);
+					self.velocity = self.velocity + v_forward * 300;
+					CopyBody(1);
+					self.velocity = self.velocity - v_forward * 300;
+				}
+				else if (imp == 14)
+					CopyBody(0);
 			}
-			else if (imp == 99 && self.deadflag == DEAD_NO)
-			{
-				self.items = IT_LASER | IT_UZI | IT_SHOTGUN | IT_GRENADE_LAUNCHER | IT_ELECTRO | IT_CRYLINK | IT_NEX | IT_HAGAR | IT_ROCKET_LAUNCHER;
-				self.ammo_shells = 999;
-				self.ammo_nails = 999;
-				self.ammo_rockets = 999;
-				self.ammo_cells = 999;
-			}
 		}
 	}
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2007-05-03 20:17:02 UTC (rev 2471)
+++ trunk/data/qcsrc/server/defs.qh	2007-05-03 21:15:40 UTC (rev 2472)
@@ -1,5 +1,7 @@
 // Globals
 
+float sv_cheats;
+
 entity	activator;
 string	string_null;
 

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2007-05-03 20:17:02 UTC (rev 2471)
+++ trunk/data/qcsrc/server/g_world.qc	2007-05-03 21:15:40 UTC (rev 2472)
@@ -77,6 +77,8 @@
 		error("world already spawned - you may have EXACTLY ONE worldspawn!");
 	world_already_spawned = TRUE;
 
+	sv_cheats = cvar("sv_cheats");
+
 	/*
 	TODO sound pack system
 	// initialize sound pack system

Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc	2007-05-03 20:17:02 UTC (rev 2471)
+++ trunk/data/qcsrc/server/gamecommand.qc	2007-05-03 21:15:40 UTC (rev 2472)
@@ -28,25 +28,28 @@
 		return;
 	}
 
-	if(argv(0) == "adminmsg")
+	if(argv(0) == "warp") if(argc == 2) if(cvar("g_campaign"))
 	{
-		if(argc == 3)
+		CampaignLevelWarp(stof(argv(1)));
+		return;
+	}
+
+	if(argv(0) == "adminmsg") if(argc == 3)
+	{
+		entity client;
+		float entno;
+		entno = stof(argv(1));
+		for(client = world; entno > 0; --entno, client = nextent(client))
+			;
+		if(client.flags & FL_CLIENT)
 		{
-			entity client;
-			float entno;
-			entno = stof(argv(1));
-			for(client = world; entno > 0; --entno, client = nextent(client))
-				;
-			if(client.flags & FL_CLIENT)
-			{
-				centerprint_atprio(client, CENTERPRIO_ADMIN, strcat("^3SERVER ADMIN:\n\n^7", argv(2)));
-				sprint(client, strcat("\{1}\{13}^3SERVER ADMIN^7: ", argv(2), "\n"));
-				print("Message sent to ", client.netname, "\n");
-			}
-			else
-				print("Client not found\n");
-			return;
+			centerprint_atprio(client, CENTERPRIO_ADMIN, strcat("^3SERVER ADMIN:\n\n^7", argv(2)));
+			sprint(client, strcat("\{1}\{13}^3SERVER ADMIN^7: ", argv(2), "\n"));
+			print("Message sent to ", client.netname, "\n");
 		}
+		else
+			print("Client not found\n");
+		return;
 	}
 
 	print("Invalid command. For a list of supported commands, try sv_cmd help.\n");