Get rid of hardcoded "Player" string for checking whether the name needs changing...

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 1b975da2b188c8fd27098897d5553fc1d80b3245..90988703e0e5f9fa491ef0759e2a95a358b7fec3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -17,7 +17,7 @@ ENDCLASS(XonoticFirstRunDialog)
 #ifdef IMPLEMENTATION
 float CheckFirstRunButton(entity me)
 {
-       if(cvar_string("_cl_name") != "Player")
+       if(cvar_string("_cl_name") != cvar_defstring("_cl_name"))
                return 1;
 
        if(cvar_string("_menu_prvm_language") != prvm_language)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index f4bd359ece79d350a1034427607a470a7dd374db..fd4e5cd19bba87545425e15de98b38477d8d4612 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -22,7 +22,7 @@ entity makeXonoticPlayerSettingsTab()
 }
 void XonoticPlayerSettingsTab_draw(entity me)
 {
-       if(cvar_string("_cl_name") == "Player")
+       if(cvar_string("_cl_name") == cvar_defstring("_cl_name"))
                me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0);
        else
                me.playerNameLabel.alpha = me.playerNameLabelAlpha;

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 5c58025fca1f5e3ac87501e585ffee2828e7aed3..dcc4a8a81729e440fbf042ddc448d4f16a83cbb2 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -256,7 +256,7 @@ void MainWindow_configureMainWindow(entity me)
 
        me.initializeDialog(me, n);
 
-       if(cvar_string("_cl_name") == "Player")
+       if(cvar_string("_cl_name") == cvar_defstring("_cl_name"))
                me.dialogToShow = me.firstRunDialog;
 }
 #endif