From: Penguinum <penguinum@gmail.com>
Date: Fri, 24 Apr 2015 13:49:14 +0000 (+0300)
Subject: Some cleanup
X-Git-Tag: xonotic-v0.8.1~40^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8cc12bb6850e587c6d5da6e440e45bca1b71ec83;p=xonotic%2Fxonotic-data.pk3dir.git

Some cleanup
---

diff --git a/qcsrc/client/antiwall.qc b/qcsrc/client/antiwall.qc
index 1005cdeee..f36ace74f 100644
--- a/qcsrc/client/antiwall.qc
+++ b/qcsrc/client/antiwall.qc
@@ -57,9 +57,6 @@ void Ent_Antiwall_Draw()
 
 void Ent_Antiwall_Remove()
 {
-	if(self.bgmscript)
-		strunzone(self.bgmscript);
-	self.bgmscript = string_null;
 }
 
 void Ent_Antiwall()
@@ -70,12 +67,6 @@ void Ent_Antiwall()
 	InterpolateOrigin_Undo();
 	self.iflags = IFLAG_ANGLES | IFLAG_ORIGIN;
 
-	if(self.bgmscriptangular)
-		fld = angles;
-	else
-		fld = origin;
-	self.fld = self.saved;
-
 	f = ReadByte();
 
 	if(f & 1)
@@ -136,31 +127,6 @@ void Ent_Antiwall()
 			self.mins = self.maxs = '0 0 0';
 		setsize(self, self.mins, self.maxs);
 
-		if(self.bgmscript)
-			strunzone(self.bgmscript);
-		self.bgmscript = ReadString();
-		if(substring(self.bgmscript, 0, 1) == "<")
-		{
-			self.bgmscript = strzone(substring(self.bgmscript, 1, -1));
-			self.bgmscriptangular = 1;
-		}
-		else
-		{
-			self.bgmscript = strzone(self.bgmscript);
-			self.bgmscriptangular = 0;
-		}
-		if(self.bgmscript != "")
-		{
-			self.bgmscriptattack = ReadByte() / 64.0;
-			self.bgmscriptdecay = ReadByte() / 64.0;
-			self.bgmscriptsustain = ReadByte() / 255.0;
-			self.bgmscriptrelease = ReadByte() / 64.0;
-			self.movedir_x = ReadCoord();
-			self.movedir_y = ReadCoord();
-			self.movedir_z = ReadCoord();
-			self.lip = ReadByte() / 255.0;
-		}
-
         self.fade_start = ReadShort();
         self.fade_end = ReadShort();
         self.alpha_max = ReadShort();
@@ -176,12 +142,9 @@ void Ent_Antiwall()
         if (!self.alpha_max) {
             self.alpha_max = 1;
         }
-		BGMScript_InitEntity(self);
 	}
 	InterpolateOrigin_Note();
 
-	self.saved = self.fld;
-
 	self.entremove = Ent_Antiwall_Remove;
 	self.draw = Ent_Antiwall_Draw;
     self.predraw = Ent_Antiwall_PreDraw;
diff --git a/qcsrc/client/antiwall.qh b/qcsrc/client/antiwall.qh
index 25e380d32..5ae5641b7 100644
--- a/qcsrc/client/antiwall.qh
+++ b/qcsrc/client/antiwall.qh
@@ -1,11 +1,8 @@
 #ifndef ANTIWALL_H
 #define ANTIWALL_H
 
-.float lip;
-.float bgmscriptangular;
 .int lodmodelindex0, lodmodelindex1, lodmodelindex2;
 .float loddistance1, loddistance2;
-.vector saved;
 .float inactive, alpha_max;
 .float fade_start, fade_end;
 .float illusion;
diff --git a/qcsrc/server/antiwall.qc b/qcsrc/server/antiwall.qc
index 05f0a1d8f..f0d9641d3 100644
--- a/qcsrc/server/antiwall.qc
+++ b/qcsrc/server/antiwall.qc
@@ -95,18 +95,6 @@ float antiwall_genericsendentity (entity to, float sf)
 			WriteCoord(MSG_ENTITY, self.maxs_y);
 			WriteCoord(MSG_ENTITY, self.maxs_z);
 		}
-		WriteString(MSG_ENTITY, self.bgmscript);
-		if(self.bgmscript != "")
-		{
-			WriteByte(MSG_ENTITY, floor(self.bgmscriptattack * 64));
-			WriteByte(MSG_ENTITY, floor(self.bgmscriptdecay * 64));
-			WriteByte(MSG_ENTITY, floor(self.bgmscriptsustain * 255));
-			WriteByte(MSG_ENTITY, floor(self.bgmscriptrelease * 64));
-			WriteCoord(MSG_ENTITY, self.movedir_x);
-			WriteCoord(MSG_ENTITY, self.movedir_y);
-			WriteCoord(MSG_ENTITY, self.movedir_z);
-			WriteByte(MSG_ENTITY, floor(self.lip * 255));
-		}
         WriteShort(MSG_ENTITY, self.fade_start);
         WriteShort(MSG_ENTITY, self.fade_end);
         WriteShort(MSG_ENTITY, self.alpha_max);