Some cleanup

diff --git a/qcsrc/client/antiwall.qc b/qcsrc/client/antiwall.qc
index 1005cdeeed09e0e9d8a0336f4bcb0f2c79846f6a..f36ace74f6cc2a217a1d6655e68459481e61c9d2 100644 (file)
--- 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 25e380d32afe03e80697117c1fd191595f5c0e73..5ae5641b7e729e400aa29849b5550af345f816a9 100644 (file)
--- 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 05f0a1d8ffb56bd55da3c287fd9edc813aae3742..f0d9641d3b8d265f97b5d4a15bb7a4ebbdc0f645 100644 (file)
--- 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);