rcon: support variable expansion in received commands

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index 6fc6c327cbd3855abedacd3debdbc97dc809091f..854c62a683e656bc01709e7a1c063e0d02f5679f 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -359,11 +359,8 @@ static void sbar_newmap(void)
 
 void Sbar_Init (void)
 {
-       if(gamemode == GAME_NORMAL) // Workaround so Quake doesn't trample on Xonotic.
-       {
-               Cmd_AddCommand(CF_CLIENT, "+showscores", Sbar_ShowScores_f, "show scoreboard");
-               Cmd_AddCommand(CF_CLIENT, "-showscores", Sbar_DontShowScores_f, "hide scoreboard");
-       }
+       Cmd_AddCommand(CF_CLIENT, "+showscores", Sbar_ShowScores_f, "show scoreboard");
+       Cmd_AddCommand(CF_CLIENT, "-showscores", Sbar_DontShowScores_f, "hide scoreboard");
        Cvar_RegisterVariable(&cl_showfps);
        Cvar_RegisterVariable(&cl_showsound);
        Cvar_RegisterVariable(&cl_showblur);
@@ -376,16 +373,16 @@ void Sbar_Init (void)
        Cvar_RegisterVariable(&cl_showdate_format);
        Cvar_RegisterVariable(&cl_showtex);
        
-       Cvar_RegisterAlias(&cl_showfps, "showfps");
-       Cvar_RegisterAlias(&cl_showsound, "showsound");
-       Cvar_RegisterAlias(&cl_showblur, "showblur");
-       Cvar_RegisterAlias(&cl_showspeed, "showspeed");
-       Cvar_RegisterAlias(&cl_showtopspeed, "showtopspeed");
-       Cvar_RegisterAlias(&cl_showtime, "showtime");
-       Cvar_RegisterAlias(&cl_showtime_format, "showtime_format");
-       Cvar_RegisterAlias(&cl_showdate, "showdate");
-       Cvar_RegisterAlias(&cl_showdate_format, "showdate_format");
-       Cvar_RegisterAlias(&cl_showtex, "showtex");
+       Cvar_RegisterVirtual(&cl_showfps, "showfps");
+       Cvar_RegisterVirtual(&cl_showsound, "showsound");
+       Cvar_RegisterVirtual(&cl_showblur, "showblur");
+       Cvar_RegisterVirtual(&cl_showspeed, "showspeed");
+       Cvar_RegisterVirtual(&cl_showtopspeed, "showtopspeed");
+       Cvar_RegisterVirtual(&cl_showtime, "showtime");
+       Cvar_RegisterVirtual(&cl_showtime_format, "showtime_format");
+       Cvar_RegisterVirtual(&cl_showdate, "showdate");
+       Cvar_RegisterVirtual(&cl_showdate_format, "showdate_format");
+       Cvar_RegisterVirtual(&cl_showtex, "showtex");
        
        Cvar_RegisterVariable(&sbar_alpha_bg);
        Cvar_RegisterVariable(&sbar_alpha_fg);
@@ -1217,7 +1214,7 @@ void Sbar_ShowFPS(void)
                svtrace.fraction = 2.0;
                cltrace.fraction = 2.0;
                // ray hits models (even animated ones) and ignores translucent materials
-               if (SVVM_prog != NULL)
+               if (sv.active)
                        svtrace = SV_TraceLine(org, dest, MOVE_HITMODEL, NULL, SUPERCONTENTS_SOLID, 0, MATERIALFLAGMASK_TRANSLUCENT, collision_extendmovelength.value);
                cltrace = CL_TraceLine(org, dest, MOVE_HITMODEL, NULL, SUPERCONTENTS_SOLID, 0, MATERIALFLAGMASK_TRANSLUCENT, collision_extendmovelength.value, true, false, &hitnetentity, true, true);
                if (cltrace.hittexture)
@@ -1237,7 +1234,7 @@ void Sbar_ShowFPS(void)
                }
                else
                {
-                       if (CLVM_prog != NULL && cltrace.ent != NULL)
+                       if (cltrace.ent != NULL)
                        {
                                prvm_prog_t *prog = CLVM_prog;
                                dpsnprintf(entstring, sizeof(entstring), "client entity %i", (int)PRVM_EDICT_TO_PROG(cltrace.ent));