Infer teamplay from gametype instead of checking serverflags & SERVERFLAG_TEAMPLAY...

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 7de2946819ceeabef3852073e8ed6ea7a3e66efb..9bcfd4e7a9c58571bbafdba76dfb5b247a1ba230 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -944,6 +944,7 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew)
 {
        make_pure(this);
        gametype = ReadRegistered(Gametypes);
+       teamplay = _MapInfo_GetTeamPlayBool(gametype);
        HUD_ModIcons_SetFunc();
        FOREACH(Scores, true, {
                if (scores_label(it)) strunzone(scores_label(it));

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index b013a8e179909cdb6589402c8929b2b793e23f37..7780c522ddb5ba43b8fd9471797dfbfb3d2e8824 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1784,13 +1784,6 @@ void CSQC_UpdateView(entity this, float w, float h)
 
        switchweapon = Weapons_from(STAT(SWITCHWEAPON));
 
-       f = (serverflags & SERVERFLAG_TEAMPLAY);
-       if(f != teamplay)
-       {
-               teamplay = f;
-               Scoreboard_InitScores();
-       }
-
        if(last_switchweapon != switchweapon)
        {
                weapontime = time;