xrGame: remove unnecessary #ifdef XR_PLATFORM_WINDOWS

Xottab-DUTY · Xottab-DUTY · commit 8e1bc69bbffc · 2024-10-24T05:23:08.000+03:00
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -42,7 +42,6 @@ extern ENGINE_API bool bShowPauseString;
 
 //#define DEMO_BUILD
 
-#ifdef XR_PLATFORM_WINDOWS
 constexpr cpcstr ErrMsgBoxTemplate[] =
 {
     "message_box_invalid_pass",
@@ -64,7 +63,6 @@ constexpr cpcstr ErrMsgBoxTemplate[] =
     "msg_box_error_loading",
     "message_box_download_level"
 };
-#endif
 
 extern bool b_shniaganeed_pp;
 
@@ -121,7 +119,6 @@ CMainMenu::CMainMenu()
         g_statHint = xr_new<CUIButtonHint>();
         m_pGameSpyFull = xr_new<CGameSpy_Full>();
 
-#ifdef XR_PLATFORM_WINDOWS
         for (cpcstr name : ErrMsgBoxTemplate)
         {
             CUIMessageBoxEx* msgBox = m_pMB_ErrDlgs.emplace_back(xr_new<CUIMessageBoxEx>());
@@ -145,7 +142,7 @@ CMainMenu::CMainMenu()
             downloadMsg->AddCallbackStr(
                 "button_yes", MESSAGE_BOX_YES_CLICKED, CUIWndCallback::void_function(this, &CMainMenu::OnDownloadMPMap));
         }
-#endif
+
         m_account_mngr = xr_new<gamespy_gp::account_manager>(m_pGameSpyFull->GetGameSpyGP());
         m_login_mngr = xr_new<gamespy_gp::login_manager>(m_pGameSpyFull);
         m_profile_store = xr_new<gamespy_profile::profile_store>();
@@ -165,13 +162,10 @@ CMainMenu::~CMainMenu()
 
     g_pGamePersistent->m_pMainMenu = nullptr;
 
-#ifdef XR_PLATFORM_WINDOWS
     xr_delete(m_account_mngr);
     xr_delete(m_login_mngr);
     xr_delete(m_profile_store);
-
     xr_delete(m_pGameSpyFull);
-#endif
 
     xr_delete(m_demo_info_loader);
     delete_data(m_pMB_ErrDlgs);
@@ -563,7 +557,6 @@ void CMainMenu::OnFrame()
             Console->Show();
     }
 
-#ifdef XR_PLATFORM_WINDOWS
     if (IsActive() || m_sPDProgress.IsInProgress)
     {
         GSUpdateStatus status = m_pGameSpyFull->Update();
@@ -576,7 +569,6 @@ void CMainMenu::OnFrame()
         case GSUpdateStatus::OutOfService: SetErrorDialog(ErrGSServiceFailed); break;
         }
     }
-#endif
 
     if (IsActive())
     {
@@ -704,7 +696,6 @@ void CMainMenu::OnPatchCheck(bool success, LPCSTR VersionName, LPCSTR URL)
 
 void CMainMenu::OnDownloadPatch(CUIWindow*, void*)
 {
-#ifdef XR_PLATFORM_WINDOWS
     CGameSpy_Available GSA;
     shared_str result_string;
     if (!GSA.CheckAvailableServices(result_string))
@@ -739,7 +730,6 @@ void CMainMenu::OnDownloadPatch(CUIWindow*, void*)
     progressCallback.bind(this, &CMainMenu::OnDownloadPatchProgress);
     m_pGameSpyFull->GetGameSpyHTTP()->DownloadFile(
         *m_sPatchURL, *m_sPatchFileName, completionCallback, progressCallback);
-#endif
 }
 
 void CMainMenu::OnDownloadPatchResult(bool success)
@@ -799,10 +789,8 @@ void CMainMenu::OnRunDownloadedPatch(CUIWindow*, void*)
 
 void CMainMenu::CancelDownload()
 {
-#ifdef XR_PLATFORM_WINDOWS
     m_pGameSpyFull->GetGameSpyHTTP()->StopDownload();
     m_sPDProgress.IsInProgress = false;
-#endif
 }
 
 void CMainMenu::SetNeedVidRestart() { m_Flags.set(flNeedVidRestart, TRUE); }
@@ -925,7 +913,6 @@ LPCSTR CMainMenu::GetGSVer()
 
 LPCSTR CMainMenu::GetPlayerName()
 {
-#ifdef XR_PLATFORM_WINDOWS
     gamespy_gp::login_manager* l_mngr = GetLoginMngr();
     gamespy_gp::profile const* tmp_prof = l_mngr ? l_mngr->get_current_profile() : NULL;
 
@@ -934,7 +921,6 @@ LPCSTR CMainMenu::GetPlayerName()
         m_player_name = tmp_prof->unique_nick();
     }
     else
-#endif
     {
         string512 name;
         GetPlayerName_FromRegistry(name, sizeof(name));
diff --git a/src/xrGame/MainMenu.h b/src/xrGame/MainMenu.h
@@ -108,9 +108,8 @@ class CMainMenu : public IMainMenu,
     gamespy_gp::login_manager* GetLoginMngr() { return m_login_mngr; }
     gamespy_profile::profile_store* GetProfileStore() { return m_profile_store; }
 
-#ifdef XR_PLATFORM_WINDOWS
-    CGameSpy_Full* GetGS() { return m_pGameSpyFull; };
-#endif
+    CGameSpy_Full* GetGS() const { return m_pGameSpyFull; }
+
 protected:
     EErrorDlg m_NeedErrDialog;
     u32 m_start_time;
diff --git a/src/xrGame/account_manager.cpp b/src/xrGame/account_manager.cpp
@@ -234,7 +234,7 @@ void account_manager::delete_profile(account_operation_cb dpcb)
     {
         m_profile_deleting_cb = dpcb;
     }
-#ifdef XR_PLATFORM_WINDOWS
+
     login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
     if (!tmp_lmngr->get_current_profile())
@@ -248,7 +248,6 @@ void account_manager::delete_profile(account_operation_cb dpcb)
     {
         m_profile_deleting_cb(false, CGameSpy_GP::TryToTranslate(tmp_res).c_str());
     }
-#endif
 }
 
 void account_manager::get_account_profiles(char const* email, char const* password, account_profiles_cb profiles_cb)
@@ -447,12 +446,10 @@ void __cdecl account_manager::delete_profile_cb(GPConnection* connection, void*
         return;
     }
     VERIFY(tmp_inst->m_gamespy_gp);
-#ifdef XR_PLATFORM_WINDOWS
     login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
     tmp_lmngr->delete_profile_obj();
     tmp_inst->m_profile_deleting_cb(true, "");
-#endif
 }
 
 void __cdecl account_manager::search_profile_cb(GPConnection* connection, void* arg, void* param)
diff --git a/src/xrGame/account_manager_console.cpp b/src/xrGame/account_manager_console.cpp
@@ -10,7 +10,6 @@
 
 void CCC_CreateGameSpyAccount::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     if (!args || (xr_strlen(args) == 0))
     {
         TInfo tmp_info;
@@ -38,12 +37,10 @@ void CCC_CreateGameSpyAccount::Execute(LPCSTR args)
     prof_data.password = tmp_password;
 
     tmp_acc_mngr->create_profile(tmp_nick, tmp_unick, tmp_email, tmp_password, gamespy_gp::account_operation_cb());
-#endif
 }
 
 void CCC_GapySpyListProfiles::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     if (!args || (xr_strlen(args) == 0))
     {
         TInfo tmp_info;
@@ -61,12 +58,10 @@ void CCC_GapySpyListProfiles::Execute(LPCSTR args)
     VERIFY(tmp_gp);
     gamespy_gp::account_manager* tmp_acc_mngr = MainMenu()->GetAccountMngr();
     tmp_acc_mngr->get_account_profiles(tmp_email, tmp_password, gamespy_gp::account_profiles_cb());
-#endif
 }
 
 void CCC_GameSpyLogin::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     if (!args || (xr_strlen(args) == 0))
     {
         TInfo tmp_info;
@@ -86,24 +81,20 @@ void CCC_GameSpyLogin::Execute(LPCSTR args)
     gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
     tmp_lmngr->login(tmp_email, tmp_nick, tmp_password, gamespy_gp::login_operation_cb());
-#endif
 }
 
 void CCC_GameSpyLogout::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu() && MainMenu()->GetGS());
     gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
     tmp_lmngr->logout();
-#endif
 }
 
 pcstr print_time(time_t const& src_time, string64& dest_time);
 
 void CCC_GameSpyPrintProfile::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu() && MainMenu()->GetGS());
     gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     gamespy_gp::profile const* tmp_profile = tmp_lmngr->get_current_profile();
@@ -117,46 +108,38 @@ void CCC_GameSpyPrintProfile::Execute(LPCSTR args)
     {
         Msg("- No profile. You are not loged in.");
     }
-#endif
 }
 
 void CCC_GameSpySuggestUNicks::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu() && MainMenu()->GetGS());
     string256 tmp_unick;
     sscanf(args, "%s", tmp_unick);
     gamespy_gp::account_manager* tmp_amngr = MainMenu()->GetAccountMngr();
     VERIFY(tmp_amngr);
     tmp_amngr->suggest_unique_nicks(tmp_unick, gamespy_gp::suggest_nicks_cb());
-#endif
 }
 
 void CCC_GameSpyRegisterUniqueNick::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu() && MainMenu()->GetGS());
     gamespy_gp::login_manager::unique_nick_t tmp_unick;
     sscanf(args, "%s", tmp_unick);
     gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
     tmp_lmngr->set_unique_nick(tmp_unick, gamespy_gp::login_operation_cb());
-#endif
 }
 
 void CCC_GameSpyDeleteProfile::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu() && MainMenu()->GetGS());
     gamespy_gp::account_manager* tmp_amngr = MainMenu()->GetAccountMngr();
     VERIFY(tmp_amngr);
     tmp_amngr->delete_profile(gamespy_gp::account_operation_cb());
-#endif
 }
 
 void CCC_GameSpyProfile::Execute(LPCSTR args)
 {
-#ifdef XR_PLATFORM_WINDOWS
     VERIFY(MainMenu());
     gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();
     VERIFY(tmp_lmngr);
@@ -187,5 +170,4 @@ void CCC_GameSpyProfile::Execute(LPCSTR args)
     {
         Log("~ This command is unsupported since old gamespy profile code has been removed from the engine.");
     }
-#endif
 }
diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp
@@ -1865,13 +1865,11 @@ class CCC_GSCheckForUpdates : public IConsole_Command
         if (mm == nullptr)
             return;
 
-#ifdef XR_PLATFORM_WINDOWS
         if (!m_checkInProgress.exchange(true))
         {
             SetupCallParams(arguments);
             mm->GetGS()->GetGameSpyPatching()->CheckForPatch(true, m_resultCallbackBinded);
         }
-#endif
     }
 };
 
diff --git a/src/xrGame/login_manager.cpp b/src/xrGame/login_manager.cpp
@@ -205,7 +205,6 @@ void login_manager::logout()
 
 void login_manager::reinit_connection_tasks()
 {
-#ifdef XR_PLATFORM_WINDOWS
     account_manager* tmp_acc_mngr = MainMenu()->GetAccountMngr();
     if (tmp_acc_mngr->is_get_account_profiles_active())
     {
@@ -222,7 +221,6 @@ void login_manager::reinit_connection_tasks()
         Msg("! WARNING: reiniting suggesting unique nicks");
         tmp_acc_mngr->reinit_suggest_unique_nicks();
     }
-#endif
 }
 
 void login_manager::delete_profile_obj() { xr_delete(m_current_profile); }
diff --git a/src/xrGame/ui/ServerList.cpp b/src/xrGame/ui/ServerList.cpp
@@ -20,7 +20,6 @@ CServerList::CServerList()
       m_header2{ "Server properties", "Players list", "Frags", "Deaths" },
       m_header_frames{ "Icon frame", "Server name frame", "Map frame", "Game type frame", "Players frame", "Ping frame", "Version frame" }
 {
-#ifdef XR_PLATFORM_WINDOWS
     CGameSpy_BrowsersWrapper::UpdateCallback updateCb;
     updateCb.bind(this, &CServerList::OnUpdate);
     m_subscriber_id = browser().SubscribeUpdates(updateCb);
@@ -55,7 +54,6 @@ CServerList::CServerList()
 
     m_last_retreived_index = u32(-1);
     m_need_refresh_fr = u32(-1);
-#endif
 }
 
 CServerList::~CServerList()
@@ -71,15 +69,11 @@ CServerList::~CServerList()
 
 CGameSpy_BrowsersWrapper* CServerList::browser_LL()
 {
-#ifdef XR_PLATFORM_WINDOWS
-    auto mm = MainMenu();
-    if (mm)
+    if (const auto mm = MainMenu())
     {
-        auto gs = mm->GetGS();
-        if (gs)
+        if (const auto gs = mm->GetGS())
             return gs->GetGameSpyBrowser();
     }
-#endif
     return nullptr;
 }
 
@@ -570,7 +564,6 @@ void CServerList::InitFromXml(CUIXml& xml_doc, LPCSTR path)
 
 void CServerList::ConnectToSelected()
 {
-#ifdef XR_PLATFORM_WINDOWS
     gamespy_gp::login_manager const* lmngr = MainMenu()->GetLoginMngr();
     R_ASSERT(lmngr);
     gamespy_gp::profile const* tmp_profile = lmngr->get_current_profile();
@@ -621,7 +614,6 @@ void CServerList::ConnectToSelected()
         item->CreateConsoleCommand(command, m_playerName.c_str(), "", "");
         Console->Execute(command.c_str());
     }
-#endif
 }
 
 void CServerList::InitHeader()

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ extern ENGINE_API bool bShowPauseString;`
`42`	`42`
`43`	`43`	`//#define DEMO_BUILD`
`44`	`44`
`45`		`-#ifdef XR_PLATFORM_WINDOWS`
`46`	`45`	`constexpr cpcstr ErrMsgBoxTemplate[] =`
`47`	`46`	`{`
`48`	`47`	`"message_box_invalid_pass",`
`@@ -64,7 +63,6 @@ constexpr cpcstr ErrMsgBoxTemplate[] =`
`64`	`63`	`"msg_box_error_loading",`
`65`	`64`	`"message_box_download_level"`
`66`	`65`	`};`
`67`		`-#endif`
`68`	`66`
`69`	`67`	`extern bool b_shniaganeed_pp;`
`70`	`68`
`@@ -121,7 +119,6 @@ CMainMenu::CMainMenu()`
`121`	`119`	`g_statHint = xr_new<CUIButtonHint>();`
`122`	`120`	`m_pGameSpyFull = xr_new<CGameSpy_Full>();`
`123`	`121`
`124`		`-#ifdef XR_PLATFORM_WINDOWS`
`125`	`122`	`for (cpcstr name : ErrMsgBoxTemplate)`
`126`	`123`	`{`
`127`	`124`	`CUIMessageBoxEx* msgBox = m_pMB_ErrDlgs.emplace_back(xr_new<CUIMessageBoxEx>());`
`@@ -145,7 +142,7 @@ CMainMenu::CMainMenu()`
`145`	`142`	`downloadMsg->AddCallbackStr(`
`146`	`143`	`"button_yes", MESSAGE_BOX_YES_CLICKED, CUIWndCallback::void_function(this, &CMainMenu::OnDownloadMPMap));`
`147`	`144`	`}`
`148`		`-#endif`
	`145`	`+`
`149`	`146`	`m_account_mngr = xr_new<gamespy_gp::account_manager>(m_pGameSpyFull->GetGameSpyGP());`
`150`	`147`	`m_login_mngr = xr_new<gamespy_gp::login_manager>(m_pGameSpyFull);`
`151`	`148`	`m_profile_store = xr_new<gamespy_profile::profile_store>();`
`@@ -165,13 +162,10 @@ CMainMenu::~CMainMenu()`
`165`	`162`
`166`	`163`	`g_pGamePersistent->m_pMainMenu = nullptr;`
`167`	`164`
`168`		`-#ifdef XR_PLATFORM_WINDOWS`
`169`	`165`	`xr_delete(m_account_mngr);`
`170`	`166`	`xr_delete(m_login_mngr);`
`171`	`167`	`xr_delete(m_profile_store);`
`172`		`-`
`173`	`168`	`xr_delete(m_pGameSpyFull);`
`174`		`-#endif`
`175`	`169`
`176`	`170`	`xr_delete(m_demo_info_loader);`
`177`	`171`	`delete_data(m_pMB_ErrDlgs);`
`@@ -563,7 +557,6 @@ void CMainMenu::OnFrame()`
`563`	`557`	`Console->Show();`
`564`	`558`	`}`
`565`	`559`
`566`		`-#ifdef XR_PLATFORM_WINDOWS`
`567`	`560`	`if (IsActive() \|\| m_sPDProgress.IsInProgress)`
`568`	`561`	`{`
`569`	`562`	`GSUpdateStatus status = m_pGameSpyFull->Update();`
`@@ -576,7 +569,6 @@ void CMainMenu::OnFrame()`
`576`	`569`	`case GSUpdateStatus::OutOfService: SetErrorDialog(ErrGSServiceFailed); break;`
`577`	`570`	`}`
`578`	`571`	`}`
`579`		`-#endif`
`580`	`572`
`581`	`573`	`if (IsActive())`
`582`	`574`	`{`
`@@ -704,7 +696,6 @@ void CMainMenu::OnPatchCheck(bool success, LPCSTR VersionName, LPCSTR URL)`
`704`	`696`
`705`	`697`	`void CMainMenu::OnDownloadPatch(CUIWindow, void)`
`706`	`698`	`{`
`707`		`-#ifdef XR_PLATFORM_WINDOWS`
`708`	`699`	`CGameSpy_Available GSA;`
`709`	`700`	`shared_str result_string;`
`710`	`701`	`if (!GSA.CheckAvailableServices(result_string))`
`@@ -739,7 +730,6 @@ void CMainMenu::OnDownloadPatch(CUIWindow, void)`
`739`	`730`	`progressCallback.bind(this, &CMainMenu::OnDownloadPatchProgress);`
`740`	`731`	`m_pGameSpyFull->GetGameSpyHTTP()->DownloadFile(`
`741`	`732`	`m_sPatchURL, m_sPatchFileName, completionCallback, progressCallback);`
`742`		`-#endif`
`743`	`733`	`}`
`744`	`734`
`745`	`735`	`void CMainMenu::OnDownloadPatchResult(bool success)`
`@@ -799,10 +789,8 @@ void CMainMenu::OnRunDownloadedPatch(CUIWindow, void)`
`799`	`789`
`800`	`790`	`void CMainMenu::CancelDownload()`
`801`	`791`	`{`
`802`		`-#ifdef XR_PLATFORM_WINDOWS`
`803`	`792`	`m_pGameSpyFull->GetGameSpyHTTP()->StopDownload();`
`804`	`793`	`m_sPDProgress.IsInProgress = false;`
`805`		`-#endif`
`806`	`794`	`}`
`807`	`795`
`808`	`796`	`void CMainMenu::SetNeedVidRestart() { m_Flags.set(flNeedVidRestart, TRUE); }`
`@@ -925,7 +913,6 @@ LPCSTR CMainMenu::GetGSVer()`
`925`	`913`
`926`	`914`	`LPCSTR CMainMenu::GetPlayerName()`
`927`	`915`	`{`
`928`		`-#ifdef XR_PLATFORM_WINDOWS`
`929`	`916`	`gamespy_gp::login_manager* l_mngr = GetLoginMngr();`
`930`	`917`	`gamespy_gp::profile const* tmp_prof = l_mngr ? l_mngr->get_current_profile() : NULL;`
`931`	`918`
`@@ -934,7 +921,6 @@ LPCSTR CMainMenu::GetPlayerName()`
`934`	`921`	`m_player_name = tmp_prof->unique_nick();`
`935`	`922`	`}`
`936`	`923`	`else`
`937`		`-#endif`
`938`	`924`	`{`
`939`	`925`	`string512 name;`
`940`	`926`	`GetPlayerName_FromRegistry(name, sizeof(name));`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ void account_manager::delete_profile(account_operation_cb dpcb)`
`234`	`234`	`{`
`235`	`235`	`m_profile_deleting_cb = dpcb;`
`236`	`236`	`}`
`237`		`-#ifdef XR_PLATFORM_WINDOWS`
	`237`	`+`
`238`	`238`	`login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`239`	`239`	`VERIFY(tmp_lmngr);`
`240`	`240`	`if (!tmp_lmngr->get_current_profile())`
`@@ -248,7 +248,6 @@ void account_manager::delete_profile(account_operation_cb dpcb)`
`248`	`248`	`{`
`249`	`249`	`m_profile_deleting_cb(false, CGameSpy_GP::TryToTranslate(tmp_res).c_str());`
`250`	`250`	`}`
`251`		`-#endif`
`252`	`251`	`}`
`253`	`252`
`254`	`253`	`void account_manager::get_account_profiles(char const* email, char const* password, account_profiles_cb profiles_cb)`
`@@ -447,12 +446,10 @@ void __cdecl account_manager::delete_profile_cb(GPConnection* connection, void*`
`447`	`446`	`return;`
`448`	`447`	`}`
`449`	`448`	`VERIFY(tmp_inst->m_gamespy_gp);`
`450`		`-#ifdef XR_PLATFORM_WINDOWS`
`451`	`449`	`login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`452`	`450`	`VERIFY(tmp_lmngr);`
`453`	`451`	`tmp_lmngr->delete_profile_obj();`
`454`	`452`	`tmp_inst->m_profile_deleting_cb(true, "");`
`455`		`-#endif`
`456`	`453`	`}`
`457`	`454`
`458`	`455`	`void __cdecl account_manager::search_profile_cb(GPConnection* connection, void* arg, void* param)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`void CCC_CreateGameSpyAccount::Execute(LPCSTR args)`
`12`	`12`	`{`
`13`		`-#ifdef XR_PLATFORM_WINDOWS`
`14`	`13`	`if (!args \|\| (xr_strlen(args) == 0))`
`15`	`14`	`{`
`16`	`15`	`TInfo tmp_info;`
`@@ -38,12 +37,10 @@ void CCC_CreateGameSpyAccount::Execute(LPCSTR args)`
`38`	`37`	`prof_data.password = tmp_password;`
`39`	`38`
`40`	`39`	`tmp_acc_mngr->create_profile(tmp_nick, tmp_unick, tmp_email, tmp_password, gamespy_gp::account_operation_cb());`
`41`		`-#endif`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`void CCC_GapySpyListProfiles::Execute(LPCSTR args)`
`45`	`43`	`{`
`46`		`-#ifdef XR_PLATFORM_WINDOWS`
`47`	`44`	`if (!args \|\| (xr_strlen(args) == 0))`
`48`	`45`	`{`
`49`	`46`	`TInfo tmp_info;`
`@@ -61,12 +58,10 @@ void CCC_GapySpyListProfiles::Execute(LPCSTR args)`
`61`	`58`	`VERIFY(tmp_gp);`
`62`	`59`	`gamespy_gp::account_manager* tmp_acc_mngr = MainMenu()->GetAccountMngr();`
`63`	`60`	`tmp_acc_mngr->get_account_profiles(tmp_email, tmp_password, gamespy_gp::account_profiles_cb());`
`64`		`-#endif`
`65`	`61`	`}`
`66`	`62`
`67`	`63`	`void CCC_GameSpyLogin::Execute(LPCSTR args)`
`68`	`64`	`{`
`69`		`-#ifdef XR_PLATFORM_WINDOWS`
`70`	`65`	`if (!args \|\| (xr_strlen(args) == 0))`
`71`	`66`	`{`
`72`	`67`	`TInfo tmp_info;`
`@@ -86,24 +81,20 @@ void CCC_GameSpyLogin::Execute(LPCSTR args)`
`86`	`81`	`gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`87`	`82`	`VERIFY(tmp_lmngr);`
`88`	`83`	`tmp_lmngr->login(tmp_email, tmp_nick, tmp_password, gamespy_gp::login_operation_cb());`
`89`		`-#endif`
`90`	`84`	`}`
`91`	`85`
`92`	`86`	`void CCC_GameSpyLogout::Execute(LPCSTR args)`
`93`	`87`	`{`
`94`		`-#ifdef XR_PLATFORM_WINDOWS`
`95`	`88`	`VERIFY(MainMenu() && MainMenu()->GetGS());`
`96`	`89`	`gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`97`	`90`	`VERIFY(tmp_lmngr);`
`98`	`91`	`tmp_lmngr->logout();`
`99`		`-#endif`
`100`	`92`	`}`
`101`	`93`
`102`	`94`	`pcstr print_time(time_t const& src_time, string64& dest_time);`
`103`	`95`
`104`	`96`	`void CCC_GameSpyPrintProfile::Execute(LPCSTR args)`
`105`	`97`	`{`
`106`		`-#ifdef XR_PLATFORM_WINDOWS`
`107`	`98`	`VERIFY(MainMenu() && MainMenu()->GetGS());`
`108`	`99`	`gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`109`	`100`	`gamespy_gp::profile const* tmp_profile = tmp_lmngr->get_current_profile();`
`@@ -117,46 +108,38 @@ void CCC_GameSpyPrintProfile::Execute(LPCSTR args)`
`117`	`108`	`{`
`118`	`109`	`Msg("- No profile. You are not loged in.");`
`119`	`110`	`}`
`120`		`-#endif`
`121`	`111`	`}`
`122`	`112`
`123`	`113`	`void CCC_GameSpySuggestUNicks::Execute(LPCSTR args)`
`124`	`114`	`{`
`125`		`-#ifdef XR_PLATFORM_WINDOWS`
`126`	`115`	`VERIFY(MainMenu() && MainMenu()->GetGS());`
`127`	`116`	`string256 tmp_unick;`
`128`	`117`	`sscanf(args, "%s", tmp_unick);`
`129`	`118`	`gamespy_gp::account_manager* tmp_amngr = MainMenu()->GetAccountMngr();`
`130`	`119`	`VERIFY(tmp_amngr);`
`131`	`120`	`tmp_amngr->suggest_unique_nicks(tmp_unick, gamespy_gp::suggest_nicks_cb());`
`132`		`-#endif`
`133`	`121`	`}`
`134`	`122`
`135`	`123`	`void CCC_GameSpyRegisterUniqueNick::Execute(LPCSTR args)`
`136`	`124`	`{`
`137`		`-#ifdef XR_PLATFORM_WINDOWS`
`138`	`125`	`VERIFY(MainMenu() && MainMenu()->GetGS());`
`139`	`126`	`gamespy_gp::login_manager::unique_nick_t tmp_unick;`
`140`	`127`	`sscanf(args, "%s", tmp_unick);`
`141`	`128`	`gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`142`	`129`	`VERIFY(tmp_lmngr);`
`143`	`130`	`tmp_lmngr->set_unique_nick(tmp_unick, gamespy_gp::login_operation_cb());`
`144`		`-#endif`
`145`	`131`	`}`
`146`	`132`
`147`	`133`	`void CCC_GameSpyDeleteProfile::Execute(LPCSTR args)`
`148`	`134`	`{`
`149`		`-#ifdef XR_PLATFORM_WINDOWS`
`150`	`135`	`VERIFY(MainMenu() && MainMenu()->GetGS());`
`151`	`136`	`gamespy_gp::account_manager* tmp_amngr = MainMenu()->GetAccountMngr();`
`152`	`137`	`VERIFY(tmp_amngr);`
`153`	`138`	`tmp_amngr->delete_profile(gamespy_gp::account_operation_cb());`
`154`		`-#endif`
`155`	`139`	`}`
`156`	`140`
`157`	`141`	`void CCC_GameSpyProfile::Execute(LPCSTR args)`
`158`	`142`	`{`
`159`		`-#ifdef XR_PLATFORM_WINDOWS`
`160`	`143`	`VERIFY(MainMenu());`
`161`	`144`	`gamespy_gp::login_manager* tmp_lmngr = MainMenu()->GetLoginMngr();`
`162`	`145`	`VERIFY(tmp_lmngr);`
`@@ -187,5 +170,4 @@ void CCC_GameSpyProfile::Execute(LPCSTR args)`
`187`	`170`	`{`
`188`	`171`	`Log("~ This command is unsupported since old gamespy profile code has been removed from the engine.");`
`189`	`172`	`}`
`190`		`-#endif`
`191`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1865,13 +1865,11 @@ class CCC_GSCheckForUpdates : public IConsole_Command`
`1865`	`1865`	`if (mm == nullptr)`
`1866`	`1866`	`return;`
`1867`	`1867`
`1868`		`-#ifdef XR_PLATFORM_WINDOWS`
`1869`	`1868`	`if (!m_checkInProgress.exchange(true))`
`1870`	`1869`	`{`
`1871`	`1870`	`SetupCallParams(arguments);`
`1872`	`1871`	`mm->GetGS()->GetGameSpyPatching()->CheckForPatch(true, m_resultCallbackBinded);`
`1873`	`1872`	`}`
`1874`		`-#endif`
`1875`	`1873`	`}`
`1876`	`1874`	`};`
`1877`	`1875`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ void login_manager::logout()`
`205`	`205`
`206`	`206`	`void login_manager::reinit_connection_tasks()`
`207`	`207`	`{`
`208`		`-#ifdef XR_PLATFORM_WINDOWS`
`209`	`208`	`account_manager* tmp_acc_mngr = MainMenu()->GetAccountMngr();`
`210`	`209`	`if (tmp_acc_mngr->is_get_account_profiles_active())`
`211`	`210`	`{`
`@@ -222,7 +221,6 @@ void login_manager::reinit_connection_tasks()`
`222`	`221`	`Msg("! WARNING: reiniting suggesting unique nicks");`
`223`	`222`	`tmp_acc_mngr->reinit_suggest_unique_nicks();`
`224`	`223`	`}`
`225`		`-#endif`
`226`	`224`	`}`
`227`	`225`
`228`	`226`	`void login_manager::delete_profile_obj() { xr_delete(m_current_profile); }`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ CServerList::CServerList()`
`20`	`20`	`m_header2{ "Server properties", "Players list", "Frags", "Deaths" },`
`21`	`21`	`m_header_frames{ "Icon frame", "Server name frame", "Map frame", "Game type frame", "Players frame", "Ping frame", "Version frame" }`
`22`	`22`	`{`
`23`		`-#ifdef XR_PLATFORM_WINDOWS`
`24`	`23`	`CGameSpy_BrowsersWrapper::UpdateCallback updateCb;`
`25`	`24`	`updateCb.bind(this, &CServerList::OnUpdate);`
`26`	`25`	`m_subscriber_id = browser().SubscribeUpdates(updateCb);`
`@@ -55,7 +54,6 @@ CServerList::CServerList()`
`55`	`54`
`56`	`55`	`m_last_retreived_index = u32(-1);`
`57`	`56`	`m_need_refresh_fr = u32(-1);`
`58`		`-#endif`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`CServerList::~CServerList()`
`@@ -71,15 +69,11 @@ CServerList::~CServerList()`
`71`	`69`
`72`	`70`	`CGameSpy_BrowsersWrapper* CServerList::browser_LL()`
`73`	`71`	`{`
`74`		`-#ifdef XR_PLATFORM_WINDOWS`
`75`		`- auto mm = MainMenu();`
`76`		`- if (mm)`
	`72`	`+ if (const auto mm = MainMenu())`
`77`	`73`	`{`
`78`		`- auto gs = mm->GetGS();`
`79`		`- if (gs)`
	`74`	`+ if (const auto gs = mm->GetGS())`
`80`	`75`	`return gs->GetGameSpyBrowser();`
`81`	`76`	`}`
`82`		`-#endif`
`83`	`77`	`return nullptr;`
`84`	`78`	`}`
`85`	`79`
`@@ -570,7 +564,6 @@ void CServerList::InitFromXml(CUIXml& xml_doc, LPCSTR path)`
`570`	`564`
`571`	`565`	`void CServerList::ConnectToSelected()`
`572`	`566`	`{`
`573`		`-#ifdef XR_PLATFORM_WINDOWS`
`574`	`567`	`gamespy_gp::login_manager const* lmngr = MainMenu()->GetLoginMngr();`
`575`	`568`	`R_ASSERT(lmngr);`
`576`	`569`	`gamespy_gp::profile const* tmp_profile = lmngr->get_current_profile();`
`@@ -621,7 +614,6 @@ void CServerList::ConnectToSelected()`
`621`	`614`	`item->CreateConsoleCommand(command, m_playerName.c_str(), "", "");`
`622`	`615`	`Console->Execute(command.c_str());`
`623`	`616`	`}`
`624`		`-#endif`
`625`	`617`	`}`
`626`	`618`
`627`	`619`	`void CServerList::InitHeader()`