From: MirceaKitsune Date: Mon, 2 May 2011 19:44:29 +0000 (+0300) Subject: Don't attempt to scale the world when weapon models are unset. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b1e581725b0ca18a2e2a7b4b7ea30b960d2c8a3;p=voretournament%2Fvoretournament.git Don't attempt to scale the world when weapon models are unset. --- diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 2b224bac..66ad0f7c 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -740,6 +740,7 @@ void CL_Weaponentity_Think() // if we are a micro or macro, size the weapon model accordingly if(self.owner.scale && cvar("g_healthsize_weapon_scalefactor")) + if(self.model != "") { self.weaponentity.scale = (1 + cvar("g_healthsize_weapon_scalefactor")) - cvar("g_healthsize_weapon_scalefactor") * self.owner.scale; self.weaponentity.origin_z = (1 - self.weaponentity.scale) * cvar("g_healthsize_weapon_scalefactor_pos"); @@ -828,6 +829,7 @@ void CL_ExteriorWeaponentity_Think() // if we are a micro or macro, size the weapon model accordingly if(self.owner.scale && cvar("g_healthsize_exteriorweapon_scalefactor")) + if(self.model != "") { 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_exteriorweapon_scalefactor")) + cvar("g_healthsize_exteriorweapon_scalefactor") * self.scale;