r3685 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Jun 3 01:50:48 EDT 2008


Author: div0
Date: 2008-06-03 01:50:48 -0400 (Tue, 03 Jun 2008)
New Revision: 3685

Modified:
   trunk/data/qcsrc/server/bots.qc
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
take out some spawnfunc_ out of strings


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2008-06-03 05:44:32 UTC (rev 3684)
+++ trunk/data/qcsrc/server/bots.qc	2008-06-03 05:50:48 UTC (rev 3685)
@@ -626,7 +626,7 @@
 							if(trace_startsolid)
 							{
 								// this WP is in solid, refuse it
-								dprint("Killed a spawnfunc_waypoint that was stuck in solid at ", vtos(org), "\n");
+								dprint("Killed a waypoint that was stuck in solid at ", vtos(org), "\n");
 								remove(w);
 								return world;
 							}
@@ -640,7 +640,7 @@
 		tracebox(w.origin, PL_MIN, PL_MAX, w.origin - '0 0 128', MOVE_WORLDONLY, w);
 		if(trace_startsolid)
 		{
-			dprint("Killed a spawnfunc_waypoint that was stuck in solid ", vtos(w.origin), "\n");
+			dprint("Killed a waypoint that was stuck in solid ", vtos(w.origin), "\n");
 			remove(w);
 			return world;
 		}
@@ -648,12 +648,12 @@
 		{
 			if(trace_fraction == 1)
 			{
-				dprint("Killed a spawnfunc_waypoint that was stuck in air at ", vtos(w.origin), "\n");
+				dprint("Killed a waypoint that was stuck in air at ", vtos(w.origin), "\n");
 				remove(w);
 				return world;
 			}
 			trace_endpos_z += 0.1; // don't trust the trace fully
-//			dprint("Moved spawnfunc_waypoint at ", vtos(w.origin), " by ", ftos(vlen(w.origin - trace_endpos)));
+//			dprint("Moved waypoint at ", vtos(w.origin), " by ", ftos(vlen(w.origin - trace_endpos)));
 //			dprint(" direction: ", vtos((trace_endpos - w.origin)), "\n");
 			setorigin(w, trace_endpos);
 		}

Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2008-06-03 05:44:32 UTC (rev 3684)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2008-06-03 05:50:48 UTC (rev 3685)
@@ -99,21 +99,21 @@
 			WaypointSprite_DeployPersonal("waypoint", self.origin);
 			self.personal_v_angle = self.v_angle;
 			self.personal_velocity = self.velocity;
-			sprint(self, "personal spawnfunc_waypoint spawned at location\n");
+			sprint(self, "personal waypoint spawned at location\n");
 		}
 		else if(imp == 31)
 		{
 			WaypointSprite_DeployPersonal("waypoint", self.cursor_trace_endpos);
 			self.personal_v_angle = self.v_angle;
 			self.personal_velocity = '0 0 0';
-			sprint(self, "personal spawnfunc_waypoint spawned at crosshair\n");
+			sprint(self, "personal waypoint spawned at crosshair\n");
 		}
 		else if(imp == 32 && vlen(self.death_origin))
 		{
 			WaypointSprite_DeployPersonal("waypoint", self.death_origin);
 			self.personal_v_angle = self.v_angle;
 			self.personal_velocity = '0 0 0';
-			sprint(self, "personal spawnfunc_waypoint spawned at death location\n");
+			sprint(self, "personal waypoint spawned at death location\n");
 		}
 		else if(imp == 33 && self.deadflag == DEAD_NO && teams_matter)
 		{
@@ -153,7 +153,7 @@
 		else if(imp == 47)
 		{
 			WaypointSprite_ClearPersonal();
-			sprint(self, "personal spawnfunc_waypoint cleared\n");
+			sprint(self, "personal waypoint cleared\n");
 		}
 		else if(imp == 48)
 		{
@@ -224,7 +224,7 @@
 						self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
 					}
 					else
-						sprint(self, "No spawnfunc_waypoint set, cheater (use g_waypointsprite_personal to set one)\n");
+						sprint(self, "No waypoint set, cheater (use g_waypointsprite_personal to set one)\n");
 				}
 				else if(imp == 99)
 				{

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-06-03 05:44:32 UTC (rev 3684)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-06-03 05:50:48 UTC (rev 3685)
@@ -620,7 +620,7 @@
 	if(!self.wait)
 		self.wait = 1;
 	if(!self.message)
-		self.message = "saw the spawnfunc_light";
+		self.message = "saw the light";
 	self.think = misc_laser_think;
 	self.nextthink = time;
 }

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-06-03 05:44:32 UTC (rev 3684)
+++ trunk/data/qcsrc/server/g_world.qc	2008-06-03 05:50:48 UTC (rev 3685)
@@ -167,7 +167,7 @@
 	dprint_load(); // load dprint status from cvar
 
 	if(world_already_spawned)
-		error("world already spawned - you may have EXACTLY ONE spawnfunc_worldspawn!");
+		error("world already spawned - you may have EXACTLY ONE worldspawn!");
 	world_already_spawned = TRUE;
 
 	if(GotoFirstMap())




More information about the nexuiz-commits mailing list