From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 16 Jul 2011 16:05:57 +0000 (+0300)
Subject: Fix the view weapon model not animating in multiplayer, if having players in your... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0139fb50259aa076f589bfd63288537ccd68123;p=voretournament%2Fvoretournament.git

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

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 691fecae..c1e9ec53 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -365,6 +365,7 @@ void CL_Weaponentity_Think()
 		return;
 	}
 	if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)
+	if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model
 	{
 		self.cnt = self.owner.weapon;
 		self.dmg = self.owner.modelindex;
@@ -778,6 +779,7 @@ void CL_ExteriorWeaponentity_Think()
 		return;
 	}
 	if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)
+	if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model
 	{
 		self.cnt = self.owner.weapon;
 		self.dmg = self.owner.modelindex;
@@ -792,7 +794,7 @@ void CL_ExteriorWeaponentity_Think()
 			self.tag_index = tag_found;
 			self.tag_entity = self.owner;
 		}
-		else if(substring(self.owner.model, -4, 4) != ".md3") // not a stomach model
+		else
 			setattachment(self, self.owner, "bip01 r hand");
 
 		// if that didn't find a tag, hide the exterior weapon model
diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 6e15fa6f..e4316e44 100644
--- a/docs/Release notes.txt	
+++ b/docs/Release notes.txt	
@@ -240,6 +240,10 @@ Bug fixes:
 
 - Fix Grabber reload being constantly re-triggered in multiplayer, if reloading with players in your stomach
 
+- Fix the view weapon model not animating in multiplayer, if having players in your stomach
+
+- Fix exterior weapon model blinking and attempting to be attached to the stomach model for predators
+
 - Tweak Grabber fuel usage and the fuel system, improving some things and fixing minor bugs.
 
 - 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.