float old_time, new_time;
if(!player) { return; } // without someone to give the reward to, we can't possibly cap
float old_time, new_time;
if(!player) { return; } // without someone to give the reward to, we can't possibly cap
- if(ctf_oneflag)
- {
- if(CTF_SAMETEAM(player, flag)) { return; }
- }
- else if(CTF_DIFFTEAM(player, flag)) { return; }
+ if(CTF_DIFFTEAM(player, flag)) { return; }
{
tmp_entity.ctf_staleflagnext = ctf_staleflaglist; // link flag into staleflaglist
ctf_staleflaglist = tmp_entity;
{
tmp_entity.ctf_staleflagnext = ctf_staleflaglist; // link flag into staleflaglist
ctf_staleflaglist = tmp_entity;
ctf_Handle_Capture(self, toucher, CAPTURE_NORMAL); // toucher just captured the neutral flag to enemy base
else if(!self.team && (!toucher.flagcarried) && (!toucher.ctf_captureshielded) && (time > toucher.next_take_time) && is_not_monster)
ctf_Handle_Pickup(self, toucher, PICKUP_BASE); // toucher just stole the neutral flag
ctf_Handle_Capture(self, toucher, CAPTURE_NORMAL); // toucher just captured the neutral flag to enemy base
else if(!self.team && (!toucher.flagcarried) && (!toucher.ctf_captureshielded) && (time > toucher.next_take_time) && is_not_monster)
ctf_Handle_Pickup(self, toucher, PICKUP_BASE); // toucher just stole the neutral flag
- flag.netname = sprintf("%s%s^7 flag", Team_ColorCode(teamnumber), Team_ColorName_Upper(teamnumber));
+ flag.netname = strzone(sprintf("%s%s^7 flag", Team_ColorCode(teamnumber), Team_ColorName_Upper(teamnumber)));
ctf_captureshield_min_negscore = autocvar_g_ctf_shield_min_negscore;
ctf_captureshield_max_ratio = autocvar_g_ctf_shield_max_ratio;
ctf_captureshield_force = autocvar_g_ctf_shield_force;
ctf_captureshield_min_negscore = autocvar_g_ctf_shield_min_negscore;
ctf_captureshield_max_ratio = autocvar_g_ctf_shield_max_ratio;
ctf_captureshield_force = autocvar_g_ctf_shield_force;
addstat(STAT_CTF_FLAGSTATUS, AS_INT, ctf_flagstatus);
InitializeEntity(world, ctf_DelayedInit, INITPRIO_GAMETYPE);
addstat(STAT_CTF_FLAGSTATUS, AS_INT, ctf_flagstatus);
InitializeEntity(world, ctf_DelayedInit, INITPRIO_GAMETYPE);