diff --git a/README-de_DE.md b/README-de_DE.md index 656fe319..aa25f1cc 100644 --- a/README-de_DE.md +++ b/README-de_DE.md @@ -71,7 +71,7 @@ Das Plugin einsetzen ==================== - Verbinde dich auf den mumble server - Aktiviere das FGCom-mumble plugin -- betrete einen Chatraum der mit `fgcom-mumble` beginnt +- betrete einen Chatraum der mit `fgcom-mumble` beginnt oder dessen Beschreibung `fgcom-mumble activated` enthält Jetzt bist du bereit, am Funkverkehr teilzunehmen! Dein Flugsimulator oder ATC-Programm muss dem Plugin nun die notwendigen Informationen senden, damit es weiß, wo du bist und welche Funkgeräte zur Verfügung stehen. diff --git a/README.md b/README.md index 2fe99f25..c615d513 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Running the client ====================== - connect your mumble client to fgfs mumble server - enable your plugin in your standard mumble client -- join a channel starting with `fgcom-mumble` +- join a channel starting with `fgcom-mumble` or with `fgcom-mumble activated` in its description. You are ready for radio usage! Some client needs to supply information to the plugin now, so it knows about your location and radio stack. diff --git a/client/mumble-plugin/fgcom-mumble.cpp b/client/mumble-plugin/fgcom-mumble.cpp index ecfea9f2..91b1cab9 100644 --- a/client/mumble-plugin/fgcom-mumble.cpp +++ b/client/mumble-plugin/fgcom-mumble.cpp @@ -311,10 +311,11 @@ mumble_error_t fgcom_loadConfig() { std::string token_value = sm[2]; pluginDbg("[CFG] Parsing token: "+token_key+"="+token_value); - if (token_key == "radioAudioEffects") fgcom_cfg.radioAudioEffects = (token_value == "0" || token_value == "false" || token_value == "off")? false : true; + if (token_key == "radioAudioEffects") fgcom_cfg.radioAudioEffects = (token_value == "0" || token_value == "false" || token_value == "off")? false : true; if (token_key == "allowHearingNonPluginUsers") fgcom_cfg.allowHearingNonPluginUsers = (token_value == "1" || token_value == "true" || token_value == "on")? true : false; - if (token_key == "specialChannel") fgcom_cfg.specialChannel = token_value; - if (token_key == "udpServerPort") fgcom_cfg.udpServerPort = std::stoi(token_value); + if (token_key == "specialChannelName") fgcom_cfg.specialChannelName = token_value; + if (token_key == "specialChannelDescription") fgcom_cfg.specialChannelDescription = token_value; + if (token_key == "udpServerPort") fgcom_cfg.udpServerPort = std::stoi(token_value); } } } else { @@ -424,7 +425,7 @@ mumble_error_t fgcom_initPlugin() { return EC_CHANNEL_NOT_FOUND; // abort online init - something horribly went wrong. } else { pluginLog("Server has "+std::to_string(channelCount)+" channels, looking for special ones"); - pluginDbg(" fgcom.specialChannel='"+fgcom_cfg.specialChannel+"'"); + pluginDbg(" fgcom.specialChannelName='"+fgcom_cfg.specialChannelName+"'"); for (size_t ci=0; ci