Change how the swallow model is attached and applied

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 5f16c965d2b179bdc6c5ef49db813cd1ba81bdb1..c44b4de9ffd9e56ec2f4df62b7c9588194eee938 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -202,9 +202,8 @@ void Vore_AutoDigest(entity e)
 void Vore_SwallowModel_Think()\r
 {\r
        //update the necessary angles to match our view\r
-       self.angles_x = self.owner.angles_x;\r
-       self.view_ofs = self.owner.view_ofs;\r
-       self.alpha = self.owner.cvar_cl_vore_stomachmodel;\r
+       //self.angles_x = self.owner.angles_x;\r
+       //self.view_ofs = self.owner.view_ofs;\r
 \r
        // if our swallow progress is gone, the swallow model must also go\r
        if(!self.owner.swallow_progress_prey)\r
@@ -233,7 +232,11 @@ void Vore_SwallowModel_Update(entity prey)
                prey.swallow_model.scale = self.scale;\r
 \r
                // apply the properties of the prey\r
-               prey.swallow_model.aiment = prey;\r
+               prey.swallow_model.viewmodelforclient = prey;\r
+               prey.swallow_model.effects |= EF_NOGUNBOB;\r
+               prey.swallow_model.alpha = prey.cvar_cl_vore_stomachmodel;\r
+               prey.swallow_model.colormap = prey.colormap;\r
+               prey.swallow_model.glowmod = prey.glowmod;\r
 \r
                prey.swallow_model.owner = prey; // owned by the prey\r
                prey.swallow_model.think = Vore_SwallowModel_Think;\r