From b4613e5904114aaa84c02bf0811b8581e7e5f4c6 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 8 Dec 2014 12:17:13 +0100 Subject: [PATCH] Get rid of hardcoded "Player" string for checking whether the name needs changing - instead compare to the cvar default. --- qcsrc/menu/xonotic/dialog_firstrun.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c | 2 +- qcsrc/menu/xonotic/mainwindow.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c index 1b975da2b..90988703e 100644 --- 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 f4bd359ec..fd4e5cd19 100644 --- 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 5c58025fc..dcc4a8a81 100644 --- 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 -- 2.39.2