X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Ftriggers%2Ffunc%2Fdoor.qc;h=fed8e9fa424515b9c3aa8aa5aa3f5029e07b3529;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hp=1b621634164b0e8a552ed22b9839a9b0b65f0c23;hpb=0e11fe379dc3d256b0041886893a0e35b70c86d9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc
index 1b6216341..fed8e9fa4 100644
--- a/qcsrc/common/triggers/func/door.qc
+++ b/qcsrc/common/triggers/func/door.qc
@@ -26,8 +26,8 @@ void() door_rotating_go_down;
 void() door_rotating_go_up;
 
 void door_blocked()
-{
-	if((self.spawnflags & 8) 
+{SELFPARAM();
+	if((self.spawnflags & 8)
 #ifdef SVQC
 		&& (other.takedamage != DAMAGE_NO)
 #elif defined(CSQC)
@@ -85,9 +85,9 @@ void door_blocked()
 }
 
 void door_hit_top()
-{
+{SELFPARAM();
 	if (self.noise1 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
 	self.state = STATE_TOP;
 	if (self.spawnflags & DOOR_TOGGLE)
 		return;		// don't come down automatically
@@ -102,16 +102,16 @@ void door_hit_top()
 }
 
 void door_hit_bottom()
-{
+{SELFPARAM();
 	if (self.noise1 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
 	self.state = STATE_BOTTOM;
 }
 
 void door_go_down()
-{
+{SELFPARAM();
 	if (self.noise2 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
 	if (self.max_health)
 	{
 		self.takedamage = DAMAGE_YES;
@@ -123,7 +123,7 @@ void door_go_down()
 }
 
 void door_go_up()
-{
+{SELFPARAM();
 	if (self.state == STATE_UP)
 		return;		// already going up
 
@@ -134,7 +134,7 @@ void door_go_up()
 	}
 
 	if (self.noise2 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
 	self.state = STATE_UP;
 	SUB_CalcMove (self.pos2, TSPEED_LINEAR, self.speed, door_hit_top);
 
@@ -155,7 +155,7 @@ ACTIVATION FUNCTIONS
 */
 
 float door_check_keys(void)
-{
+{SELFPARAM();
 	local entity door;
 
 
@@ -180,7 +180,7 @@ float door_check_keys(void)
 		if (other.key_door_messagetime <= time)
 		{
 
-			play2(other, "misc/talk.wav");
+			play2(other, SND(TALK));
 			Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_DOOR_LOCKED_ALSONEED, item_keys_keylist(door.itemkeys));
 			other.key_door_messagetime = time + 2;
 		}
@@ -190,7 +190,7 @@ float door_check_keys(void)
 		// no keys were used
 		if (other.key_door_messagetime <= time)
 		{
-			play2(other, "misc/talk.wav");
+			play2(other, SND(TALK));
 			Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_DOOR_LOCKED_NEED, item_keys_keylist(door.itemkeys));
 
 			other.key_door_messagetime = time + 2;
@@ -202,7 +202,7 @@ float door_check_keys(void)
 	{
 #ifdef SVQC
 		// door is now unlocked
-		play2(other, "misc/talk.wav");
+		play2(other, SND(TALK));
 		Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_DOOR_UNLOCKED);
 #endif
 		return true;
@@ -212,15 +212,12 @@ float door_check_keys(void)
 }
 
 void door_fire()
-{
-	entity 	oself;
+{SELFPARAM();
 	entity	starte;
 
 	if (self.owner != self)
 		objerror ("door_fire: self.owner != self");
 
-	oself = self;
-
 	if (self.spawnflags & DOOR_TOGGLE)
 	{
 		if (self.state == STATE_UP || self.state == STATE_TOP)
@@ -236,9 +233,9 @@ void door_fire()
 				{
 					door_rotating_go_down ();
 				}
-				self = self.enemy;
+				setself(self.enemy);
 			} while ( (self != starte) && (self != world) );
-			self = oself;
+			setself(this);
 			return;
 		}
 	}
@@ -265,29 +262,23 @@ void door_fire()
 				door_rotating_go_up ();
 			}
 		}
-		self = self.enemy;
+		setself(self.enemy);
 	} while ( (self != starte) && (self != world) );
-	self = oself;
+	setself(this);
 }
 
 void door_use()
-{
-	entity oself;
-
+{SELFPARAM();
 	//dprint("door_use (model: ");dprint(self.model);dprint(")\n");
 
 	if (self.owner)
 	{
-		oself = self;
-		self = self.owner;
-		door_fire ();
-		self = oself;
+		WITH(entity, self, self.owner, door_fire());
 	}
 }
 
 void door_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
-	entity oself;
+{SELFPARAM();
 	if(self.spawnflags & DOOR_NOSPLASH)
 		if(!(DEATH_ISSPECIAL(deathtype)) && (deathtype & HITTYPE_SPLASH))
 			return;
@@ -301,12 +292,9 @@ void door_damage(entity inflictor, entity attacker, float damage, int deathtype,
 
 	if (self.health <= 0)
 	{
-		oself = self;
-		self = self.owner;
-		self.health = self.max_health;
-		self.takedamage = DAMAGE_NO;	// wil be reset upon return
-		door_use ();
-		self = oself;
+		self.owner.health = self.owner.max_health;
+		self.owner.takedamage = DAMAGE_NO;	// wil be reset upon return
+		WITH(entity, self, self.owner, door_use());
 	}
 }
 
@@ -320,7 +308,7 @@ Prints messages
 */
 
 void door_touch()
-{
+{SELFPARAM();
 	if (!IS_PLAYER(other))
 		return;
 	if (self.owner.attack_finished_single > time)
@@ -333,13 +321,13 @@ void door_touch()
 	{
 		if (IS_CLIENT(other))
 			centerprint(other, self.owner.message);
-		play2(other, "misc/talk.wav");
+		play2(other, SND(TALK));
 	}
 #endif
 }
 
 void door_generic_plat_blocked()
-{
+{SELFPARAM();
 
 	if((self.spawnflags & 8) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
 #ifdef SVQC
@@ -377,9 +365,9 @@ void door_generic_plat_blocked()
 }
 
 void door_rotating_hit_top()
-{
+{SELFPARAM();
 	if (self.noise1 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
 	self.state = STATE_TOP;
 	if (self.spawnflags & DOOR_TOGGLE)
 		return;		// don't come down automatically
@@ -388,9 +376,9 @@ void door_rotating_hit_top()
 }
 
 void door_rotating_hit_bottom()
-{
+{SELFPARAM();
 	if (self.noise1 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTEN_NORM);
 	if (self.lip==666) // self.lip is used to remember reverse opening direction for door_rotating
 	{
 		self.pos2 = '0 0 0' - self.pos2;
@@ -400,9 +388,9 @@ void door_rotating_hit_bottom()
 }
 
 void door_rotating_go_down()
-{
+{SELFPARAM();
 	if (self.noise2 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
 	if (self.max_health)
 	{
 		self.takedamage = DAMAGE_YES;
@@ -414,7 +402,7 @@ void door_rotating_go_down()
 }
 
 void door_rotating_go_up()
-{
+{SELFPARAM();
 	if (self.state == STATE_UP)
 		return;		// already going up
 
@@ -424,7 +412,7 @@ void door_rotating_go_up()
 		return;
 	}
 	if (self.noise2 != "")
-		sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
+		_sound (self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTEN_NORM);
 	self.state = STATE_UP;
 	SUB_CalcAngleMove (self.pos2, TSPEED_LINEAR, self.speed, door_rotating_hit_top);
 
@@ -445,7 +433,7 @@ Spawned if a door lacks a real activator
 */
 
 void door_trigger_touch()
-{
+{SELFPARAM();
 	if (other.health < 1)
 #ifdef SVQC
 		if (!((other.iscreature || (other.flags & FL_PROJECTILE)) && !PHYS_DEAD(other)))
@@ -465,12 +453,12 @@ void door_trigger_touch()
 
 	activator = other;
 
-	self = self.owner;
+	setself(self.owner);
 	door_use ();
 }
 
 void spawn_field(vector fmins, vector fmaxs)
-{
+{SELFPARAM();
 	entity	trigger;
 	vector	t1 = fmins, t2 = fmaxs;
 
@@ -500,7 +488,7 @@ LinkDoors
 */
 
 entity LinkDoors_nextent(entity cur, entity near, entity pass)
-{
+{SELFPARAM();
 	while((cur = find(cur, classname, self.classname)) && ((cur.spawnflags & 4) || cur.enemy))
 	{
 	}
@@ -524,7 +512,7 @@ bool LinkDoors_isconnected(entity e1, entity e2, entity pass)
 void door_link();
 #endif
 void LinkDoors()
-{
+{SELFPARAM();
 	entity	t;
 	vector	cmins, cmaxs;
 
@@ -553,10 +541,10 @@ void LinkDoors()
 	FindConnectedComponent(self, enemy, LinkDoors_nextent, LinkDoors_isconnected, world);
 
 	// set owner, and make a loop of the chain
-	dprint("LinkDoors: linking doors:");
+	LOG_TRACE("LinkDoors: linking doors:");
 	for(t = self; ; t = t.enemy)
 	{
-		dprint(" ", etos(t));
+		LOG_TRACE(" ", etos(t));
 		t.owner = self;
 		if(t.enemy == world)
 		{
@@ -564,7 +552,7 @@ void LinkDoors()
 			break;
 		}
 	}
-	dprint("\n");
+	LOG_TRACE("\n");
 
 	// collect health, targetname, message, size
 	cmins = self.absmin;
@@ -647,7 +635,7 @@ FIXME: only one sound set available at the time being
 */
 
 float door_send(entity to, float sf)
-{
+{SELFPARAM();
 	WriteByte(MSG_ENTITY, ENT_CLIENT_DOOR);
 	WriteByte(MSG_ENTITY, sf);
 
@@ -709,7 +697,7 @@ void door_link()
 #endif
 
 void door_init_startopen()
-{
+{SELFPARAM();
 	SUB_SETORIGIN(self, self.pos2);
 	self.pos2 = self.pos1;
 	self.pos1 = self.origin;
@@ -720,7 +708,7 @@ void door_init_startopen()
 }
 
 void door_reset()
-{
+{SELFPARAM();
 	SUB_SETORIGIN(self, self.pos1);
 	self.SUB_VELOCITY = '0 0 0';
 	self.state = STATE_BOTTOM;
@@ -735,7 +723,7 @@ void door_reset()
 #ifdef SVQC
 
 // spawnflags require key (for now only func_door)
-void spawnfunc_func_door()
+spawnfunc(func_door)
 {
 	// Quake 1 keys compatibility
 	if (self.spawnflags & SPAWNFLAGS_GOLD_KEY)
@@ -815,7 +803,7 @@ void door_draw()
 }
 
 void ent_door()
-{
+{SELFPARAM();
 	float sf = ReadByte();
 
 	if(sf & SF_TRIGGER_INIT)
@@ -824,7 +812,7 @@ void ent_door()
 		self.spawnflags = ReadByte();
 
 		self.mdl = strzone(ReadString());
-		setmodel(self, self.mdl);
+		_setmodel(self, self.mdl);
 
 		trigger_common_read(true);