Fix green blue flag message in item name

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 81291c2a06d91387ff677f7bb3ba76bd774b3358..85c3f02a59414847210ad4bf958eb0c6d95f5413 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2729,14 +2729,8 @@ void HUD_Mod_CTF(vector pos, vector mySize)
        float redflag, blueflag, yellowflag, pinkflag; // current status
        float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime, yellowflag_statuschange_elapsedtime, pinkflag_statuschange_elapsedtime; // time since the status changed
        float stat_items;
-       float teams_count = 0;
        float fs, fs2, fs3, size1, size2;
        vector e1, e2;
-       entity tm;
-
-       for(tm = teams.sort_next; tm; tm = tm.sort_next)
-       if(tm.team != NUM_SPECTATOR)
-               ++teams_count;
 
        stat_items = getstati(STAT_ITEMS, 0, 24);
        redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
@@ -2753,9 +2747,9 @@ void HUD_Mod_CTF(vector pos, vector mySize)
        {
                redflag = 1;
                blueflag = 2;
-               if(teams_count >= 3)
+               if(team_count >= 3)
                        yellowflag = 2;
-               if(teams_count >= 4)
+               if(team_count >= 4)
                        pinkflag = 3;
        }
 
@@ -2914,7 +2908,7 @@ void HUD_Mod_CTF(vector pos, vector mySize)
                        break;
        }
 
-       switch(teams_count)
+       switch(team_count)
        {
                default:
                case 2: fs = 0.5; fs2 = 0.5; fs3 = 0.5; break;

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 937eb648e2c97cafe3ac6a8290a8c32aa17f5a38..0e1cb6a713ab07d16bb96e98248ddfd9a66cf0d7 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1002,7 +1002,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 
        setattachment(flag, world, "");
 
-       flag.netname = ((teamnumber == NUM_TEAM_1) ? "^1RED^7 flag" : ((teamnumber == NUM_TEAM_2) ? "^2BLUE^7 flag" : ((teamnumber == NUM_TEAM_3) ? "^3YELLOW^7 flag" : "^6PINK^7 flag")));
+       flag.netname = ((teamnumber == NUM_TEAM_1) ? "^1RED^7 flag" : ((teamnumber == NUM_TEAM_2) ? "^4BLUE^7 flag" : ((teamnumber == NUM_TEAM_3) ? "^3YELLOW^7 flag" : "^6PINK^7 flag")));
        flag.team = teamnumber;
        flag.classname = "item_flag_team";
        flag.target = "###item###"; // wut?