Show a no swallow indicator when the entity is a player you could normally swallow...

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 2d50c99ed265febf6604b489fd3f678b4b803cc3..a0a337b0ce31dfaafb5d5f131f309e1fedcb5947 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -1008,6 +1008,8 @@ void CSQC_UpdateView(float w, float h)
                                wcross_style = "_canswallow_team.tga";\r
                        else if(swallow_indicator > 0)\r
                                wcross_style = "_canswallow.tga";\r
                                wcross_style = "_canswallow_team.tga";\r
                        else if(swallow_indicator > 0)\r
                                wcross_style = "_canswallow.tga";\r

+                       else if(swallow_indicator < 0)\r
+                               wcross_style = "_canswallow_no.tga";\r

                        else\r
                                wcross_style = cvar_string("crosshair");\r
 \r
                        else\r
                                wcross_style = cvar_string("crosshair");\r
 \r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d675f5d5bf8b866c7beb21f9b54d597a44693566..8a9dc2fb76b0e792110399ab3b76ddb894f438b0 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -547,6 +547,8 @@ void Vore()
                if(self.BUTTON_ATCK)\r
                        Vore_Swallow(prey);\r
        }\r
                if(self.BUTTON_ATCK)\r
                        Vore_Swallow(prey);\r
        }\r

+       else if(prey != world)\r
+               self.stat_canswallow = -1;\r

 \r
        // toggle digestion, if the player has someone in their stomach\r
        if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))\r
 \r
        // toggle digestion, if the player has someone in their stomach\r
        if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))\r