+#include "gamemode_race.qh"
+
#ifndef GAMEMODE_RACE_H
#define GAMEMODE_RACE_H
return 0;
}
-float race_teams;
-
-// scores
-const float ST_RACE_LAPS = 1;
-const float SP_RACE_LAPS = 4;
-const float SP_RACE_TIME = 5;
-const float SP_RACE_FASTEST = 6;
#endif
#ifdef IMPLEMENTATION
.float race_checkpoint;
void havocbot_role_race()
{SELFPARAM();
- if(self.deadflag != DEAD_NO)
+ if(IS_DEAD(self))
return;
entity e;
}
MUTATOR_HOOKFUNCTION(rc, PlayerDies)
-{SELFPARAM();
- self.respawn_flags |= RESPAWN_FORCE;
- race_AbandonRaceCheck(self);
+{
+ frag_target.respawn_flags |= RESPAWN_FORCE;
+ race_AbandonRaceCheck(frag_target);
return false;
}
{
if(!g_race_qualifying)
{
- ret_float = WinningCondition_QualifyingThenRace(checkrules_fraglimit);
+ ret_float = WinningCondition_Race(checkrules_fraglimit);
return true;
}
else if(g_race_qualifying == 2)
qualifying_override = autocvar_g_race_qualifying_timelimit_override;
fraglimit_override = autocvar_g_race_laps_limit;
leadlimit_override = 0; // currently not supported by race
- timelimit_override = -1; // use default if we don't set it below
+ timelimit_override = autocvar_timelimit_override;
- // we need to find out the correct value for g_race_qualifying
float want_qualifying = ((qualifying_override >= 0) ? qualifying_override : autocvar_g_race_qualifying_timelimit) > 0;
if(autocvar_g_campaign)
g_race_qualifying = 1;
independent_players = 1;
}
- else if(!autocvar_g_campaign && want_qualifying)
+ else if(want_qualifying)
{
g_race_qualifying = 2;
independent_players = 1;
- race_fraglimit = (race_fraglimit >= 0) ? fraglimit_override : autocvar_fraglimit;
- race_leadlimit = (race_leadlimit >= 0) ? leadlimit_override : autocvar_leadlimit;
- race_timelimit = (race_timelimit >= 0) ? timelimit_override : autocvar_timelimit;
+ race_fraglimit = (fraglimit_override >= 0) ? fraglimit_override : autocvar_fraglimit;
+ race_leadlimit = (leadlimit_override >= 0) ? leadlimit_override : autocvar_leadlimit;
+ race_timelimit = (timelimit_override >= 0) ? timelimit_override : autocvar_timelimit;
+ qualifying_override = (qualifying_override >= 0) ? qualifying_override : autocvar_g_race_qualifying_timelimit;
fraglimit_override = 0;
leadlimit_override = 0;
- timelimit_override = autocvar_g_race_qualifying_timelimit;
+ timelimit_override = qualifying_override;
}
else
g_race_qualifying = 0;
-
SetLimits(fraglimit_override, leadlimit_override, timelimit_override, qualifying_override);
}