Merge branch 'master' into mirceakitsune/health_size

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d8d69312dd8a3f4db8332e952c3e262ecf171644..f2d04205c2550cb2ce95d252b31dc80a72af1f47 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1529,7 +1529,7 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co
 set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
 set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables"\r
 seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"\r
-seta cl_vore_cutvolume_music 0.5 "music volume is reduced to this amount when you are in a stomach"\r
+seta cl_vore_cutvolume_music 0.25 "music volume is reduced to this amount when you are in a stomach"\r
 seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"\r
 seta cl_vore_autodigest 0 "when enabled, the player will automatically begin digesting enemy prey after eating them, as long as no team mates are inside (automated digest key)"\r
 set g_vore 1 "enables the vore system, you want this on!"\r

diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh
index eb5403d76e99db39d7dbbf67f89835e8834ba691..4452d487d1752b9c3e8ae3cce3a801bc3e26af9b 100644 (file)
--- a/data/qcsrc/server/constants.qh
+++ b/data/qcsrc/server/constants.qh
@@ -130,6 +130,7 @@ vector      PL_MAX                                  = '16 16 45';
 vector PL_CROUCH_VIEW_OFS                      = '0 0 15';\r
 vector PL_CROUCH_MIN                           = '-16 -16 -24';\r
 vector PL_CROUCH_MAX                           = '16 16 25';\r
+vector PL_PREY_VIEW_OFS                        = '0 0 15';\r
 \r
 // Sajt - added these, just as constants. Not sure how you want them actually put in the game, but I just\r
 // did this so at least they worked\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 790c000a3667a83bd0f5da0bfedea4aa02dcf54c..2429326b16f27201a30e3b64501e923cbb51bfd4 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -129,7 +129,7 @@ void Vore_CameraEffect_Set(entity e)
 }\r
 void Vore_CameraEffect_Apply()\r
 {\r
-       if(self.predator.classname != "player")\r
+       if not(self.predator.classname == "player" || self.fakeprey)\r
                return;\r
 \r
        if(self.cvar_cl_vore_cameraspeed)\r
@@ -146,7 +146,7 @@ void Vore_CameraEffect_Apply()
        else\r
                self.cameraeffect_current = self.cameraeffect_target;\r
 \r
-       self.view_ofs_z = PL_VIEW_OFS_z / self.cameraeffect_current;\r
+       self.view_ofs_z = PL_PREY_VIEW_OFS_z / self.cameraeffect_current;\r
 }\r
 \r
 .float gurgle_oldstomachload;\r
@@ -628,6 +628,8 @@ void Vore()
 // Code that addresses the prey:\r
 // --------------------------------\r
 \r
+       Vore_CameraEffect_Apply();\r
+\r
        // keepdeadprey - detach dead prey if their predator died or got swallowed\r
        if(self.fakepredator.classname == "player")\r
        if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.predator.classname == "player")\r
@@ -668,8 +670,6 @@ void Vore()
        if(self.BUTTON_JUMP)\r
                Vore_StomachLeave();\r
 \r
-       Vore_CameraEffect_Apply();\r
-\r
        // Ugly workaround for a Keyhunt issue. Your team's key can still be given to you while in the stomach\r
        // (at round start), which is pretty ugly and wrong. So attempt to drop keys each frame for prey\r
        kh_Key_DropAll(self, FALSE);\r