X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwall.qc;h=9da9bb5b658338fdacca81cbc3e7ef2d7dafd90d;hb=c51698509e174e343dff48128a1dcfff1527c535;hp=6a9f5a440fc1c1d6f0fc366d5110945bda33d300;hpb=3a1633035f0cb6a41a8ee0018c2996a4416f62a1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc
index 6a9f5a440..9da9bb5b6 100644
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -1,15 +1,23 @@
 #include "wall.qh"
 
+#include "bgmscript.qh"
+
+
+#include "../lib/csqcmodel/interpolate.qh"
+
+.float alpha;
+.float scale;
+.vector movedir;
+
 void Ent_Wall_PreDraw()
-{
+{SELFPARAM();
 	if (self.inactive)
 	{
 		self.alpha = 0;
 	}
 	else
 	{
-		vector org;
-		org = getpropertyvec(VF_ORIGIN);
+		vector org = getpropertyvec(VF_ORIGIN);
 		if(!checkpvs(org, self))
 			self.alpha = 0;
 		else if(self.fade_start || self.fade_end) {
@@ -41,7 +49,7 @@ void Ent_Wall_PreDraw()
 		self.drawmask = MASK_NORMAL;
 }
 
-void Ent_Wall_Draw()
+void Ent_Wall_Draw(entity this)
 {
 	float f;
 	var .vector fld;
@@ -50,7 +58,7 @@ void Ent_Wall_Draw()
 		fld = angles;
 	else
 		fld = origin;
-	self.fld = self.saved;
+	self.(fld) = self.saved;
 
 	if(self.lodmodelindex1)
 	{
@@ -79,16 +87,16 @@ void Ent_Wall_Draw()
 
 	InterpolateOrigin_Do();
 
-	self.saved = self.fld;
+	self.saved = self.(fld);
 
-	f = BGMScript(self);
+	f = doBGMScript(self);
 	if(f >= 0)
 	{
 		if(self.lip < 0) // < 0: alpha goes from 1 to 1-|lip| when toggled (toggling subtracts lip)
 			self.alpha = 1 + self.lip * f;
 		else // > 0: alpha goes from 1-|lip| to 1 when toggled (toggling adds lip)
 			self.alpha = 1 - self.lip * (1 - f);
-		self.fld = self.fld + self.movedir * f;
+		self.(fld) = self.(fld) + self.movedir * f;
 	}
 	else
 		self.alpha = 1;
@@ -100,14 +108,14 @@ void Ent_Wall_Draw()
 }
 
 void Ent_Wall_Remove()
-{
+{SELFPARAM();
 	if(self.bgmscript)
 		strunzone(self.bgmscript);
 	self.bgmscript = string_null;
 }
 
 void Ent_Wall()
-{
+{SELFPARAM();
 	int f;
 	var .vector fld;
 
@@ -118,7 +126,7 @@ void Ent_Wall()
 		fld = angles;
 	else
 		fld = origin;
-	self.fld = self.saved;
+	self.(fld) = self.saved;
 
 	f = ReadByte();
 
@@ -216,7 +224,7 @@ void Ent_Wall()
 
 	InterpolateOrigin_Note();
 
-	self.saved = self.fld;
+	self.saved = self.(fld);
 
 	self.entremove = Ent_Wall_Remove;
 	self.draw = Ent_Wall_Draw;