From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 2 May 2011 16:32:03 +0000 (+0300)
Subject: The exterior weapon entity will now scale properly as well
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec5de618f3f2afe949fcaefca7c6cf7c3b44eb69;p=voretournament%2Fvoretournament.git

The exterior weapon entity will now scale properly as well
---

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 78c92e1a..034b4fc7 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -736,15 +736,14 @@ void CL_Weaponentity_Think()
 
 	}
 
+	// create or update the lasertarget entity
+
 	// if we are a micro or macro, size the weapon model accordingly
 	if(self.owner.scale && cvar("g_healthsize_weaponscalefactor"))
 	{
 		self.weaponentity.scale = (1 + cvar("g_healthsize_weaponscalefactor")) - cvar("g_healthsize_weaponscalefactor") * self.owner.scale;
 		self.weaponentity.origin_z = (1 - self.weaponentity.scale) * cvar("g_healthsize_weaponscalefactor_viewmodel_pos");
-		dprint(strcat(ftos(self.weaponentity.origin_z), "\n"));
 	}
-
-	// create or update the lasertarget entity
 };
 
 void CL_ExteriorWeaponentity_Think()
@@ -827,6 +826,13 @@ void CL_ExteriorWeaponentity_Think()
 		self.angles = ang;
 	}
 
+	// if we are a micro or macro, size the weapon model accordingly
+	if(self.owner.scale && cvar("g_healthsize_weaponscalefactor"))
+	{
+		self.scale = 1 / self.owner.scale; // for some reason, the exterior weapon entity copies the player's scale somewhere else, so undo that first
+		self.scale = (1 - cvar("g_healthsize_weaponscalefactor")) + cvar("g_healthsize_weaponscalefactor") * self.scale;
+	}
+
 	self.colormap = self.owner.colormap;
 	self.customizeentityforclient = CL_ExteriorWeaponentity_CustomizeEntityForClient;
 };