ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Benau 2019-05-27 13:13:51 +08:00
parent d3ef05b37c
commit 72c61e412a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp
View File

@ -183,11 +183,11 @@ void CIrrDeviceAndroid::printConfig()
int32_t ui_mode_night = AConfiguration_getUiModeNight(Android->config);
os::Printer::log("Android configuration: ", ELL_DEBUG);
os::Printer::log(" country:", country != NULL ? country : "unknown", ELL_DEBUG);
os::Printer::log(" country:", !std::string(country).empty() ? country : "unknown", ELL_DEBUG);
os::Printer::log(" density:", core::stringc(density).c_str(), ELL_DEBUG);
os::Printer::log(" keyboard:", core::stringc(keyboard).c_str(), ELL_DEBUG);
os::Printer::log(" keys_hidden:", core::stringc(keys_hidden).c_str(), ELL_DEBUG);
os::Printer::log(" language:", language != NULL ? language : "unknown", ELL_DEBUG);
os::Printer::log(" language:", !std::string(language).empty() ? language : "unknown", ELL_DEBUG);
os::Printer::log(" mcc:", core::stringc(mcc).c_str(), ELL_DEBUG);
os::Printer::log(" mnc:", core::stringc(mnc).c_str(), ELL_DEBUG);
os::Printer::log(" nav_hidden:", core::stringc(nav_hidden).c_str(), ELL_DEBUG);

14
src/utils/translation.cpp
View File

@ -390,19 +390,19 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
char p_language[3] = {};
AConfiguration_getLanguage(global_android_app->config,
p_language);
if (p_language != NULL)
std::string s_language(p_language);
if (!s_language.empty())
{
language += p_language;
language += s_language;
char p_country[3] = {};
AConfiguration_getCountry(global_android_app->config,
p_country);
if (p_country)
std::string s_country(p_country);
if (!s_country.empty())
{
language += "_";
language += p_country;
language += s_country;
}
}
}