Finally fix the prey scanning issue! I was forgetting to use makevectors() to generat...

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 1ab5b7ea3b1ff0b4d4ff7ba0203c8455c7b60f09..c5d359ad45d3495f6c4f568be8c19f12b944f01e 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -203,11 +203,6 @@ float TrueAimCheck()
        ta = trueaim;\r
        mv = MOVE_NOMONSTERS;\r
 \r
-       switch(activeweapon)\r
-       {\r
-               case WEP_GRABBER: // no trueaim\r
-       }\r
-\r
        vecs = decompressShotOrigin(getstati(STAT_SHOTORG));\r
 \r
        traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta);\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 76dca4064a07d087c4cfabf0e15adef00bde6cdd..cda4791ea5082acc2c1caa4b75aa3de45060cc94 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -18,6 +18,7 @@ entity Swallow_player_check()
        swallow_range = cvar("g_balance_vore_swallow_range");\r
        if(cvar("g_healthsize")) // we can swallow from further or closer based on our size\r
                swallow_range *= self.scale;\r
+       makevectors(self.angles);\r
        vore_w_shotorg = self.origin;\r
        vore_w_shotdir = v_forward;\r
 \r
@@ -662,7 +663,6 @@ void Vore_SetSbarRings()
        }\r
 }\r
 \r
-.entity prey;\r
 void Vore()\r
 {\r
        // main vore code, this is where it all happens\r
@@ -765,22 +765,23 @@ void Vore()
 // Code that addresses predators:\r
 // --------------------------------\r
 \r
-       self.prey = Swallow_player_check();\r
+       entity prey;\r
+       prey = Swallow_player_check();\r
 \r
        // attempt to swallow our new prey if we pressed the attack button, and there's any in range\r
        self.stat_canswallow = 0;\r
-       if(Swallow_condition_check(self.prey))\r
+       if(Swallow_condition_check(prey))\r
        {\r
                // canswallow stat, used by the HUD\r
-               if(teams_matter && self.prey.team == self.team)\r
+               if(teams_matter && prey.team == self.team)\r
                        self.stat_canswallow = 2;\r
                else\r
                        self.stat_canswallow = 1;\r
 \r
                if(self.BUTTON_ATCK)\r
-                       Vore_SwallowStep(self.prey);\r
+                       Vore_SwallowStep(prey);\r
        }\r
-       else if(self.prey != world)\r
+       else if(prey != world)\r
                self.stat_canswallow = -1;\r
 \r
        // toggle digestion, if the player has someone in their stomach\r