else\r
dprint("File ", animfilename, " not found, assuming legacy .zym model animation timings\n");\r
\r
- // the line below is disabled due to issues with the stomach model, which cannot be animated.\r
- // customizeentityforclient cannot let this part of the code know whether it's the stomach model or normal\r
- // player model we're using. Attempting to animate the stomach model causes BIG issues, and must not be allowed.\r
-\r
- // reset animstate now\r
- //setanim(self, self.anim_idle, TRUE, FALSE, TRUE);\r
+ // if this is the stomach model (or any model that can't be animated), don't attempt to animate\r
+ if not(substring(self.model, strlen(self.model) - 3, 3) == "md3") // check model extension\r
+ setanim(self, self.anim_idle, TRUE, FALSE, TRUE);\r
};\r
\r
void player_anim (void)\r
{\r
+ // if this is the stomach model (or any model that can't be animated), don't attempt to animate\r
+ if(substring(self.model, strlen(self.model) - 3, 3) == "md3") // check model extension\r
+ return;\r
+\r
updateanim(self);\r
if (self.weaponentity)\r
updateanim(self.weaponentity);\r
setanim(self.weaponentity, self.weaponentity.anim_idle, TRUE, FALSE, FALSE);\r
}\r
\r
-void SpawnThrownWeapon (vector org, float w)\r
+void SpawnThrownWeapon (vector org, float w, float doreduce)\r
{\r
- W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, FALSE);\r
+ W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, doreduce);\r
}\r
\r
void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)\r
self.dmg_take = self.dmg_take + take;//max(take - 10, 0);\r
self.dmg_inflictor = inflictor;\r
\r
- if (self.health <= -75 && self.modelindex != 0)\r
+ if (self.health <= -cvar("sv_gibhealth") && self.modelindex != 0)\r
{\r
// don't use any animations as a gib\r
self.frame = 0;\r
// clear selected player display\r
ClearSelectedPlayer();\r
// throw a weapon\r
- SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);\r
+ SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, FALSE);\r
// print an obituary message\r
Obituary (attacker, inflictor, self, deathtype);\r
race_PreDie();\r
}\r
}\r
\r
-.float dropweapon_check;\r
void UpdateSelectedPlayer()\r
{\r
entity selected;\r
if(!self.dropweapon_check)\r
if(self.predator.team != self.team) // don't disarm team mates when swallowing them\r
if(random() < cvar("g_balance_vore_swallow_dropweapon"))\r
- SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);\r
+ SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, TRUE);\r
self.dropweapon_check = TRUE;\r
}\r
else\r