Fix the view weapon model not animating in multiplayer, if having players in your...

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 691fecae5c37abf1e453e73175dfe1624399af78..c1e9ec53b9398ecf07a4040ec0a278bfd22d67ae 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -365,6 +365,7 @@ void CL_Weaponentity_Think()
                return;\r
        }\r
        if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)\r
+       if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
        {\r
                self.cnt = self.owner.weapon;\r
                self.dmg = self.owner.modelindex;\r
@@ -778,6 +779,7 @@ void CL_ExteriorWeaponentity_Think()
                return;\r
        }\r
        if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)\r
+       if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
        {\r
                self.cnt = self.owner.weapon;\r
                self.dmg = self.owner.modelindex;\r
@@ -792,7 +794,7 @@ void CL_ExteriorWeaponentity_Think()
                        self.tag_index = tag_found;\r
                        self.tag_entity = self.owner;\r
                }\r
-               else if(substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
+               else\r
                        setattachment(self, self.owner, "bip01 r hand");\r
 \r
                // if that didn't find a tag, hide the exterior weapon model\r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 6e15fa6f98fb3ced0fa96d7438e3af8ad46d109e..e4316e443c0a1d2bf86f8eb0d5705a8e4d3b2edf 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -240,6 +240,10 @@ Bug fixes:
 \r
 - Fix Grabber reload being constantly re-triggered in multiplayer, if reloading with players in your stomach\r
 \r
+- Fix the view weapon model not animating in multiplayer, if having players in your stomach\r
+\r
+- Fix exterior weapon model blinking and attempting to be attached to the stomach model for predators\r
+\r
 - Tweak Grabber fuel usage and the fuel system, improving some things and fixing minor bugs.\r
 \r
 - Disable GLSL color control by default, as it seems to be the cause for some video card issues. This MIGHT fix the white screen problem some people have been reporting, as well as the game crashing between map changes.\r