Clean up droptofloor() macro hacks and clarify naming

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / onslaught / sv_onslaught.qc

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index ea07659e340a078927c60ee163bb5f043fe57468..8d9ad2e11b7c653effa52b745f8147b404d44146 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -804,7 +804,7 @@ void ons_ControlPoint_Setup(entity cp)
        {
                setorigin(cp, cp.origin + '0 0 20');
                cp.noalign = false;
-               droptofloor(cp);
+               DropToFloor_QC_DelayedInit(cp);
                set_movetype(cp, MOVETYPE_TOSS);
        }
 
@@ -1104,7 +1104,7 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o
        gen.colormap = 1024 + (teamnum - 1) * 17;
 
        // generator placement
-       droptofloor(gen);
+       DropToFloor_QC_DelayedInit(gen);
 
        // waypointsprites
        WaypointSprite_SpawnFixed(WP_Null, gen.origin + CPGEN_WAYPOINT_OFFSET, gen, sprite, RADARICON_NONE);
@@ -1197,7 +1197,7 @@ bool Onslaught_CheckWinner()
        {
                Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
                Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
-               TeamScore_AddToTeam(winner_team, ST_ONS_CAPS, +1);
+               TeamScore_AddToTeam(winner_team, ST_ONS_GENS, +1);
        }
        else if(winner_team == -1)
        {
@@ -2135,7 +2135,7 @@ void ons_ScoreRules()
        int teams = TeamBalance_GetAllowedTeams(balance);
        TeamBalance_Destroy(balance);
        GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, 0, {
-           field_team(ST_ONS_CAPS, "destroyed", SFL_SORT_PRIO_PRIMARY);
+           field_team(ST_ONS_GENS, "generators", SFL_SORT_PRIO_PRIMARY);
            field(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY);
            field(SP_ONS_TAKES, "takes", 0);
        });