X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_lights.qc;h=425716d2da7cb92dc3001d2383947b7a4eab86dd;hb=64c5403b271432150972626d3104064e3ec51f16;hp=98f2c436392d63f181412115892f6f9c87062ff9;hpb=df2fe9b28cb6210b671bec6d5ae834ff4eb2e2db;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_lights.qc b/qcsrc/server/g_lights.qc
index 98f2c4363..425716d2d 100644
--- a/qcsrc/server/g_lights.qc
+++ b/qcsrc/server/g_lights.qc
@@ -37,7 +37,7 @@ flags:
 void dynlight_think(entity this)
 {
 	if(!this.owner)
-		remove(this);
+		delete(this);
 
 	this.nextthink = time + 0.1;
 }
@@ -47,8 +47,8 @@ void dynlight_find_aiment(entity this)
 	if (!this.target)
 		objerror (this, "dynlight: no target to follow");
 
-	targ = find(world, targetname, this.target);
-	this.movetype = MOVETYPE_FOLLOW;
+	targ = find(NULL, targetname, this.target);
+	set_movetype(this, MOVETYPE_FOLLOW);
 	this.aiment = targ;
 	this.owner = targ;
 	this.punchangle = targ.angles;
@@ -63,9 +63,9 @@ void dynlight_find_path(entity this)
 	if (!this.target)
 		objerror (this, "dynlight: no target to follow");
 
-	targ = find(world, targetname, this.target);
+	targ = find(NULL, targetname, this.target);
 	this.target = targ.target;
-	setorigin (this, targ.origin);
+	setorigin(this, targ.origin);
 	setthink(this, train_next);
 	this.nextthink = time + 0.1;
 }
@@ -75,7 +75,7 @@ void dynlight_find_target(entity this)
 	if (!this.target)
 		objerror (this, "dynlight: no target to follow");
 
-	targ = find(world, targetname, this.target);
+	targ = find(NULL, targetname, this.target);
 	setattachment(this, targ, this.dtagname);
 	this.owner = targ;
 	setthink(this, dynlight_think);
@@ -97,7 +97,7 @@ spawnfunc(dynlight)
 	this.lefty = this.light_lev;
 	this.use = dynlight_use;
 	setsize (this, '0 0 0', '0 0 0');
-	setorigin (this, this.origin);
+	setorigin(this, this.origin);
 	//this.pflags = PFLAGS_FULLDYNAMIC;
 	this.solid = SOLID_NOT;
 	//this.blocked = func_null;
@@ -123,7 +123,7 @@ spawnfunc(dynlight)
 	if (this.target)
 //	if (!(this.spawnflags & DFOLLOW))
 	{
-		this.movetype = MOVETYPE_NOCLIP;
+		set_movetype(this, MOVETYPE_NOCLIP);
 		if (!this.speed)
 			this.speed = 100;
 		InitializeEntity(this, dynlight_find_path, INITPRIO_FINDTARGET);