From e7a3090e95c6faa61bf0a1c0d573abc465991e81 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 3 Jun 2008 05:50:48 +0000
Subject: [PATCH] take out some spawnfunc_ out of strings

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3685 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/bots.qc       |  8 ++++----
 data/qcsrc/server/cl_impulse.qc | 10 +++++-----
 data/qcsrc/server/g_triggers.qc |  2 +-
 data/qcsrc/server/g_world.qc    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/qcsrc/server/bots.qc b/data/qcsrc/server/bots.qc
index 2d9e101d3..e0d701be3 100644
--- a/data/qcsrc/server/bots.qc
+++ b/data/qcsrc/server/bots.qc
@@ -626,7 +626,7 @@ entity(vector m1, vector m2, float f) waypoint_spawn =
 							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 @@ entity(vector m1, vector m2, float f) waypoint_spawn =
 		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 @@ entity(vector m1, vector m2, float f) waypoint_spawn =
 		{
 			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);
 		}
diff --git a/data/qcsrc/server/cl_impulse.qc b/data/qcsrc/server/cl_impulse.qc
index 45331baaa..9d4c1cdcc 100644
--- a/data/qcsrc/server/cl_impulse.qc
+++ b/data/qcsrc/server/cl_impulse.qc
@@ -99,21 +99,21 @@ void ImpulseCommands (void)
 			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 @@ void ImpulseCommands (void)
 		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 @@ void ImpulseCommands (void)
 						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)
 				{
diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index 0fa74eea0..0baf47903 100644
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -620,7 +620,7 @@ void() spawnfunc_misc_laser =
 	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;
 }
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 57a9f4caa..f1e6fa37b 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -167,7 +167,7 @@ void spawnfunc_worldspawn (void)
 	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())
-- 
2.39.2