diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp b/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp index 0a191d392..0c353f400 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp @@ -386,13 +386,13 @@ namespace Callback * ms_buffIconSettingsChangedCallback = 0; - - bool ms_voiceChatEnabled = true; - bool ms_voiceUsePushToTalk = true; + // all voice options disabled by default + bool ms_voiceChatEnabled = false; + bool ms_voiceUsePushToTalk = false; bool ms_voiceUseAdvancedChannelSelection = false; - bool ms_voiceShowFlybar = true; + bool ms_voiceShowFlybar = false; bool ms_voiceAutoDeclineInvites = false; - bool ms_voiceAutoJoinChannels = true; + bool ms_voiceAutoJoinChannels = false; bool ms_defaultExamineHideAppearance = false; bool ms_doubleClickAppearanceUnequip = true; @@ -863,10 +863,11 @@ void CuiPreferences::install () REGISTER_OPTION(hideCharactersOnClosedGalaxies); - CuiVoiceChatManager::setVoiceChatEnabled(getVoiceChatEnabled()); - CuiVoiceChatManager::setUsePushToTalkForceUpdate(getVoiceUsePushToTalk()); - CuiVoiceChatManager::setShowFlybar(getVoiceShowFlybar()); - CuiVoiceChatManager::setUseAdvancedChannelSelection(getVoiceUseAdvancedChannelSelection()); + // disable all voice preferences by default + CuiVoiceChatManager::setVoiceChatEnabled(false); + CuiVoiceChatManager::setUsePushToTalkForceUpdate(false); + CuiVoiceChatManager::setShowFlybar(false); + CuiVoiceChatManager::setUseAdvancedChannelSelection(false); // Update our utils class with our loaded option. setCurrencyFormat(static_cast(ms_currencyFormat)); diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatManager.cpp b/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatManager.cpp index def0c2fcc..cc01b48db 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatManager.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiVoiceChatManager.cpp @@ -741,8 +741,11 @@ std::string CuiVoiceChatManager::getCsReportString() //---------------------------------------------------------------------------- +// disable the ability to enable voice chat void CuiVoiceChatManager::setVoiceChatEnabled(bool enabled) { + return; + /* if(enabled != getVoiceChatEnabled()) { std::stringstream ss; @@ -753,6 +756,7 @@ void CuiVoiceChatManager::setVoiceChatEnabled(bool enabled) CuiPreferences::setVoiceChatEnabled(enabled); CuiVoiceChatManagerNamespace::Transceivers::enabledChanged.emitMessage(enabled); } + */ } //---------------------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp index a4f94adb5..9d7228034 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp @@ -55,8 +55,10 @@ namespace SwgCuiButtonBarNamespace const StringId squelched = StringId("ui_chatroom", "squelched"); const StringId lotsOverLimitSpam = StringId("ui", "lots_over_limit_spam"); - const int NORMAL_NUMBER_BUTTONS_SPACE = 18; - const int NORMAL_NUMBER_BUTTONS_GROUND = 16; + // these numbers were reduced based on the removal of the help/cs and tcg menu buttons otherwise the hover offset is fucked + // also for some reason these numbers need to be 2 less than the actual number of menu items, thanks SOE + const int NORMAL_NUMBER_BUTTONS_SPACE = 16; + const int NORMAL_NUMBER_BUTTONS_GROUND = 14; void onConfirmGoHomeClosed(const CuiMessageBox & box); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp index d42f1766d..d1c1b0935 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp @@ -1595,15 +1595,15 @@ bool SwgCuiHudAction::performAction (const std::string & id, const Unicode::Str SwgCuiLfg::sendSavedInterests(); } - else if (id == SwgCuiActions::toggleVoiceFlyBar) - { - CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceFlyBar); - } + //else if (id == SwgCuiActions::toggleVoiceFlyBar) + //{ + // CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceFlyBar); + //} - else if (id == SwgCuiActions::toggleVoiceActiveSpeakers) - { - CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceActiveSpeakers); - } + //else if (id == SwgCuiActions::toggleVoiceActiveSpeakers) + //{ + // CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceActiveSpeakers); + //} //else if (id == CuiActions::tcg) //{ //SwgCuiTcgWindow * tcgWindow = safe_cast(CuiMediatorFactory::getInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false, false)); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOpt.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOpt.cpp index 318dc2737..d4c576a23 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOpt.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOpt.cpp @@ -51,7 +51,7 @@ namespace SwgCuiOptNamespace OT_terrain, OT_ui, OT_keymap, - OT_voice, + //OT_voice, OT_numTabs }; @@ -109,8 +109,9 @@ m_keepSettings (false) getCodeDataObject (TUIPage, optionPage, "pageUi"); (*m_optionPages) [OT_ui] = new SwgCuiOptUi (*optionPage); - getCodeDataObject (TUIPage, optionPage, "pageVoice"); - (*m_optionPages) [OT_voice] = new SwgCuiOptVoice (*optionPage); + // do not show the "voice" page of settings as this feature is deprecated + //getCodeDataObject (TUIPage, optionPage, "pageVoice"); + //(*m_optionPages) [OT_voice] = new SwgCuiOptVoice (*optionPage); getCodeDataObject (TUIPage, optionPage, "pageKeymap"); (*m_optionPages) [OT_keymap] = new SwgCuiOptKeymap (*optionPage, Game::getHudSceneType()); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOptKeymap.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOptKeymap.cpp index 9c887795e..6353c4197 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOptKeymap.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiOptKeymap.cpp @@ -538,6 +538,10 @@ void SwgCuiOptKeymap::updateData () cbis.cmd->category == Categories::custom) continue; } + // don't show voice commands + if (cbis.cmd->category == "voice") { + continue; + } Unicode::String localizedCommandName; Unicode::String localizedCommandDesc; @@ -681,6 +685,13 @@ void SwgCuiOptKeymap::resetTabs () if (category == Categories::internal) continue; #endif + // do not show anyone the "voice" keybind tab of options + // this should technically be removed from the input/inputmap_*.iff files, but they are mIFF source not datatables, + // and they were not included in the leak, so they need a bit of reverse engineering, so this will do for now + if (category == "voice") { + continue; + } + std::string categoryIdName = "keybind_category_"; categoryIdName += category; StringId categoryId(s_optStringFileName, categoryIdName); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserDefault.cpp b/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserDefault.cpp index 7305dcdb6..c524ea8fe 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserDefault.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserDefault.cpp @@ -111,7 +111,7 @@ namespace SwgCuiCommandParserDefaultNamespace MAKE_COMMAND (moods); MAKE_COMMAND (chatTypes); MAKE_COMMAND (emoticons); - MAKE_COMMAND (bug); + //MAKE_COMMAND (bug); MAKE_COMMAND (memoryReport); MAKE_COMMAND (memoryVerify); MAKE_COMMAND (garbageCollect); @@ -182,7 +182,7 @@ namespace SwgCuiCommandParserDefaultNamespace { Commands::moods, 0, "", "List available moods."}, { Commands::chatTypes, 0, "", "List available chat types."}, { Commands::emoticons, 0, "", "List known emoticons."}, - { Commands::bug, 0, "", "Submit a bug"}, + //{ Commands::bug, 0, "", "Submit a bug"}, { Commands::brightnessContrastGamma, 3, " ", "Set the brightness, contrast, and gamma"}, { Commands::alarmAddIn, 3, " Ex. /alarmAddIn 0 30 Pizza is ready!", "Set an alarm to go off in the specified time"}, { Commands::alarmAddAt, 3, " Ex. /alarmAddAt 0 0 Time to go to bed...it is midnight!", "Set an alarm to go off at the specified military time"}, @@ -433,13 +433,13 @@ m_aliasHandler (0) removeAliasStatic (Unicode::narrowToWide ("drawNetworkIds")); #endif - setAliasStatic ("browser", "/ui browser"); - setAliasStatic ("url", "/ui url"); + //setAliasStatic ("browser", "/ui browser"); + //setAliasStatic ("url", "/ui url"); addSubCommand (new SwgCuiCommandParserChatRoom ()); addSubCommand(new SwgCuiCommandParserShip); addSubCommand(new SwgCuiCommandParserNebula); - addSubCommand(new SwgCuiCommandParserVoice); + //addSubCommand(new SwgCuiCommandParserVoice); loadAliases(m_aliasFilename.c_str ()); @@ -1367,11 +1367,11 @@ bool SwgCuiCommandParserDefault::performParsing (const NetworkId & userId, const //----------------------------------------------------------------- - else if (isCommand(argv[0], Commands::bug)) - { - IGNORE_RETURN(CuiActionManager::performAction (CuiActions::bugReport, Unicode::emptyString)); - return true; - } + //else if (isCommand(argv[0], Commands::bug)) + //{ + // IGNORE_RETURN(CuiActionManager::performAction (CuiActions::bugReport, Unicode::emptyString)); + // return true; + //} //----------------------------------------------------------------- diff --git a/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserUI.cpp b/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserUI.cpp index 18f1147c9..23aa0a607 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserUI.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserUI.cpp @@ -173,8 +173,8 @@ namespace SwgCuiCommandParserUINamespace {CommandNames::inputScheme, 0, "[scheme]", "Reset or list"}, {CommandNames::reticleSelect, 1, "[reticle #]", "Select the current reticle."}, {CommandNames::radarSelect, 1, "[radar #]", "Select the current reticle."}, - {CommandNames::browser, 0, "", "Opens a web browser. If no URL is specified, you will be sent to the SWG home page."}, - {CommandNames::url, 1, "", "Passes the specified URL to the Web Browser." }, + //{CommandNames::browser, 0, "", "Opens a web browser. If no URL is specified, you will be sent to the SWG home page."}, + //{CommandNames::url, 1, "", "Passes the specified URL to the Web Browser." }, #if PRODUCTION == 0 {CommandNames::debugPrint, 1, "<1|0>", "."}, {CommandNames::list, 0, "", "List all UI Pages."}, @@ -560,6 +560,7 @@ bool SwgCuiCommandParserUI::performParsing (const NetworkId & userId, const Stri return true; } + /* else if(isCommand(argv[0], CommandNames::browser)) { if(argv.size() > 1) @@ -581,6 +582,7 @@ bool SwgCuiCommandParserUI::performParsing (const NetworkId & userId, const Stri return true; } + */ #if PRODUCTION == 0