self.enemy = oldself;
self.lip = oldself.lip;
self.colormap = oldself.colormap;
+ self.glowmod = oldself.glowmod;
self.iscreature = oldself.iscreature;
self.angles = oldself.angles;
self.avelocity = oldself.avelocity;
self.movetype = oldself.movetype;
self.nextthink = oldself.nextthink;
self.solid = oldself.solid;
+ self.ballistics_density = oldself.ballistics_density;
self.takedamage = oldself.takedamage;
self.think = oldself.think;
self.customizeentityforclient = oldself.customizeentityforclient;
float player_getspecies()
{
- local float glob, i, j, fh, len, s, sk;
- local string fn, l;
-
- s = -1;
-
- glob = search_begin("models/player/*.txt", TRUE, TRUE);
- if(glob < 0)
- return s;
- for(j = 0; j <= 1; ++j)
- {
- for(i = 0; i < search_getsize(glob); ++i)
- {
- fn = search_getfilename(glob, i);
- fh = fopen(fn, FILE_READ);
- if(fh < 0)
- continue;
- fgets(fh); fgets(fh);
- sk = stof(fgets(fh));
- if(sk == (j ? 0 : self.skinindex)) // 2nd pass skips the skin test
- if(fgets(fh) == self.model)
- {
- l = fgets(fh);
- len = tokenize_console(l);
- if (len != 2)
- goto nospecies;
- if (argv(0) != "species")
- goto nospecies;
- switch(argv(1))
- {
- case "human": s = SPECIES_HUMAN; break;
- case "alien": s = SPECIES_ALIEN; break;
- case "robot_shiny": s = SPECIES_ROBOT_SHINY; break;
- case "robot_rusty": s = SPECIES_ROBOT_RUSTY; break;
- case "robot_solid": s = SPECIES_ROBOT_SOLID; break;
- case "animal": s = SPECIES_ANIMAL; break;
- case "reserved": s = SPECIES_RESERVED; break;
- }
- }
-:nospecies
- fclose(fh);
- }
- if (s >= 0)
- break;
- }
- search_end(glob);
-
- if (s < 0)
- s = SPECIES_HUMAN;
-
+ float s;
+ get_model_parameters(self.playermodel, self.skinindex);
+ s = get_model_parameters_species;
+ get_model_parameters(string_null, 0);
+ if(s < 0)
+ return SPECIES_HUMAN;
return s;
}
else
Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
- if((g_arena && numspawned < 2) || (g_ca && player_cnt < 2) && !inWarmupStage)
+ if((g_arena && numspawned < 2) || (g_ca && ca_players < required_ca_players) && !inWarmupStage)
return;
if (!g_minstagib)
frag_attacker = attacker;
frag_inflictor = inflictor;
+ frag_target = self;
MUTATOR_CALLHOOK(PlayerDies);
if(self.flagcarried)
self.movetype = MOVETYPE_TOSS;
// shootable corpse
self.solid = SOLID_CORPSE;
+ self.ballistics_density = cvar("g_ballistics_density_corpse");
// don't stick to the floor
self.flags &~= FL_ONGROUND;
// dying animation
// call the corpse damage function just in case it wants to gib
self.event_damage(inflictor, attacker, 0, deathtype, hitloc, force);
// set up to fade out later
- SUB_SetFade (self, time + 12 + random () * 4, 1);
+ SUB_SetFade (self, time + 6 + random (), 1);
// remove laserdot
if(self.weaponentity)
var .string field;
fh = fopen(f, FILE_READ);
if(fh < 0)
+ {
+ dprint("Player sound file not found: ", f, "\n");
return;
+ }
while((s = fgets(fh)))
{
if(tokenize_console(s) != 3)
}
.float modelindex_for_playersound;
+.float skinindex_for_playersound;
void UpdatePlayerSounds()
{
if(self.modelindex == self.modelindex_for_playersound)
+ if(self.skinindex == self.skinindex_for_playersound)
return;
self.modelindex_for_playersound = self.modelindex;
+ self.skinindex_for_playersound = self.skinindex;
ClearPlayerSounds();
LoadPlayerSounds("sound/player/default.sounds", 1);
- LoadPlayerSounds(strcat(self.model, ".sounds"), 0);
+ LoadPlayerSounds(get_model_datafilename(self.playermodel, self.skinindex, "sounds"), 0);
}
void FakeGlobalSound(string sample, float chan, float voicetype)