start_ammo_fuel = cvar("g_start_ammo_fuel");
}
- if (inWarmupStage)
+ if (warmup_stage)
{
warmup_start_ammo_shells = start_ammo_shells;
warmup_start_ammo_nails = start_ammo_nails;
{ if(cvar(mut_cvar) && dependence) { MUTATOR_ADD(mut_name); } }
CHECK_MUTATOR_ADD("g_dodging", mutator_dodging, 1);
- CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, 1);
+ CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, teamplay);
CHECK_MUTATOR_ADD("g_physical_items", mutator_physical_items, 1);
CHECK_MUTATOR_ADD("g_touchexplode", mutator_touchexplode, 1);
CHECK_MUTATOR_ADD("g_minstagib", mutator_minstagib, 1);
CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1);
CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1);
CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1);
+ CHECK_MUTATOR_ADD("g_overkill", mutator_overkill, !cvar("g_minstagib"));
#undef CHECK_MUTATOR_ADD
sv_autotaunt = cvar("sv_autotaunt");
sv_taunt = cvar("sv_taunt");
- inWarmupStage = cvar("g_warmup");
+ warmup_stage = cvar("g_warmup");
g_warmup_limit = cvar("g_warmup_limit");
g_warmup_allguns = cvar("g_warmup_allguns");
g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
- inWarmupStage = 0; // these modes cannot work together, sorry
+ warmup_stage = 0; // these modes cannot work together, sorry
g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
if(!g_weapon_stay)
g_weapon_stay = cvar("g_weapon_stay");
- if not(inWarmupStage)
+ if not(warmup_stage)
game_starttime = time + cvar("g_start_delay");
readplayerstartcvars();
if(trace_dphitcontents == 0)
{
//dprint("A hit happened with zero hit contents... DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct.\n");
- dprint(sprintf(_("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n"), num_for_edict(self), self.classname, vtos(self.origin)));
+ dprint(sprintf("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin)));
checkclient();
}
if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
// these can be traceLINES as we already verified the starting box
mstart = start + 0.5 * (e.mins + e.maxs);
traceline(mstart, mstart + '1 0 0' * delta_x, MOVE_NORMAL, e);
- if (trace_fraction >= 1)
+ if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
continue;
traceline(mstart, mstart - '1 0 0' * delta_x, MOVE_NORMAL, e);
- if (trace_fraction >= 1)
+ if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
continue;
traceline(mstart, mstart + '0 1 0' * delta_y, MOVE_NORMAL, e);
- if (trace_fraction >= 1)
+ if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
continue;
traceline(mstart, mstart - '0 1 0' * delta_y, MOVE_NORMAL, e);
- if (trace_fraction >= 1)
+ if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
continue;
traceline(mstart, mstart + '0 0 1' * delta_z, MOVE_NORMAL, e);
- if (trace_fraction >= 1)
+ if (trace_fraction >= 1 || trace_dphittexturename == "common/caulk")
continue;
- // rule 4: we must "see" some spawnpoint
+ // rule 4: we must "see" some spawnpoint or item
for(sp = world; (sp = find(sp, classname, "info_player_deathmatch")); )
if(checkpvs(mstart, sp))
- break;
+ if((traceline(mstart, sp.origin, MOVE_NORMAL, e), trace_fraction) >= 1)
+ break;
if(!sp)
{
for(sp = world; (sp = findflags(sp, flags, FL_ITEM)); )
if(checkpvs(mstart, sp))
- break;
+ if((traceline(mstart, sp.origin + (sp.mins + sp.maxs) * 0.5, MOVE_NORMAL, e), trace_fraction) >= 1)
+ break;
if(!sp)
continue;
}