From 0acbc22be051557a25c17ca00f4e5a0d4cf8a733 Mon Sep 17 00:00:00 2001 From: XorTroll Date: Fri, 25 Oct 2019 17:55:20 +0200 Subject: [PATCH] Make use of NX_CONSTEXPR --- nx/include/switch/applets/psel.h | 14 +++++++++++--- nx/source/applets/psel.c | 14 -------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/nx/include/switch/applets/psel.h b/nx/include/switch/applets/psel.h index 52dd1e73..69d002a2 100644 --- a/nx/include/switch/applets/psel.h +++ b/nx/include/switch/applets/psel.h @@ -62,21 +62,29 @@ void pselUiAddInvalidUser(PselUiSettings *ui, AccountUid *user_id); * @param flag Flag value. * @note Only used for ::PselUiMode_SelectUser */ -void pselUiSetAllowUserCreation(PselUiSettings *ui, bool flag); +NX_CONSTEXPR void pselUiSetAllowUserCreation(PselUiSettings *ui, bool flag) { + if(ui->mode == PselUiMode_SelectUser) { + ui->allowUserCreation = flag; + } +} /** * @brief Sets whether users need to be linked to a Nintendo account. * @param ui PselUiSettings struct. * @param flag Flag value. */ -void pselUiSetNetworkServiceRequired(PselUiSettings *ui, bool flag); +NX_CONSTEXPR void pselUiSetNetworkServiceRequired(PselUiSettings *ui, bool flag) { + ui->networkServiceRequired = flag; +} /** * @brief Sets whether selection can be skipped (with a new button) * @param ui PselUiSettings struct. * @param flag Flag value. */ -void pselUiSetSkipEnabled(PselUiSettings *ui, bool flag); +NX_CONSTEXPR void pselUiSetSkipEnabled(PselUiSettings *ui, bool flag) { + ui->skipEnabled = flag; +} /** * @brief Shows the applet with the specified UI settings. diff --git a/nx/source/applets/psel.c b/nx/source/applets/psel.c index 6754351b..51827884 100644 --- a/nx/source/applets/psel.c +++ b/nx/source/applets/psel.c @@ -24,20 +24,6 @@ void pselUiAddInvalidUser(PselUiSettings *ui, AccountUid *user_id) { } } -void pselUiSetAllowUserCreation(PselUiSettings *ui, bool flag) { - if(ui->mode == PselUiMode_SelectUser) { - ui->allowUserCreation = flag; - } -} - -void pselUiSetNetworkServiceRequired(PselUiSettings *ui, bool flag) { - ui->networkServiceRequired = flag; -} - -void pselUiSetSkipEnabled(PselUiSettings *ui, bool flag) { - ui->skipEnabled = flag; -} - static u32 _pselGetLaVersion() { u32 ver = 0; u32 hosver = hosversionGet();