[nexuiz-commits] r6956 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-10 05:20:43 -0400 (Wed, 10 Jun 2009)
New Revision: 6956

Modified:
   trunk/data/qcsrc/server/bots.qc
   trunk/data/qcsrc/server/bots_scripting.qc
Log:
minor fixes for bots scripting


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-06-10 07:16:46 UTC (rev 6955)
+++ trunk/data/qcsrc/server/bots.qc	2009-06-10 09:20:43 UTC (rev 6956)
@@ -694,6 +694,7 @@
 	}
 
 	w = spawn();
+	w.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
 	w.classname = "waypoint";
 	w.wpflags = f;
 	setorigin(w, (m1 + m2) * 0.5);

Modified: trunk/data/qcsrc/server/bots_scripting.qc
===================================================================
--- trunk/data/qcsrc/server/bots_scripting.qc	2009-06-10 07:16:46 UTC (rev 6955)
+++ trunk/data/qcsrc/server/bots_scripting.qc	2009-06-10 09:20:43 UTC (rev 6956)
@@ -695,7 +695,7 @@
 	if(!e)
 		return CMD_STATUS_ERROR;
 
-	v = (e.absmin + e.absmax) * 0.5;
+	v = e.origin + (e.mins + e.maxs) * 0.5;
 
 	if(tokens==1)
 	{
@@ -896,10 +896,11 @@
 float bot_cmd_movetotarget()
 {
 	entity e;
-	e = find(world, targetname, argv(0));
+	e = find(world, targetname, bot_cmd.bot_cmd_parm_string);
+	print(etos(e), "\n");
 	if(!e)
 		return CMD_STATUS_ERROR;
-	return self.cmd_moveto((e.absmin + e.absmax) * 0.5);
+	return self.cmd_moveto(e.origin + (e.mins + e.maxs) * 0.5);
 }
 
 float bot_cmd_resetgoal()