- code cleanup based on additional gcc warnings
This commit is contained in:
parent
33d87512b0
commit
ad7569ded1
|
@ -156,7 +156,7 @@ void Lang::loadGameStrings(string uselanguage, bool loadFonts,
|
||||||
// Example values:
|
// Example values:
|
||||||
// DEFAULT_CHARSET (English) = 1
|
// DEFAULT_CHARSET (English) = 1
|
||||||
// GB2312_CHARSET (Chinese) = 134
|
// GB2312_CHARSET (Chinese) = 134
|
||||||
Shared::Platform::charSet = strToInt(lang.getString("FONT_CHARSET_WINDOWS"));
|
Shared::Platform::PlatformContextGl::charSet = strToInt(lang.getString("FONT_CHARSET_WINDOWS"));
|
||||||
}
|
}
|
||||||
if( lang.hasString("FONT_MULTIBYTE_WINDOWS")) {
|
if( lang.hasString("FONT_MULTIBYTE_WINDOWS")) {
|
||||||
Font::fontIsMultibyte = strToBool(lang.getString("FONT_MULTIBYTE_WINDOWS"));
|
Font::fontIsMultibyte = strToBool(lang.getString("FONT_MULTIBYTE_WINDOWS"));
|
||||||
|
|
|
@ -4605,7 +4605,7 @@ int glestMain(int argc, char** argv) {
|
||||||
// Setup debug logging etc
|
// Setup debug logging etc
|
||||||
setupLogging(config, haveSpecialOutputCommandLineOption);
|
setupLogging(config, haveSpecialOutputCommandLineOption);
|
||||||
|
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] Font::charCount = %d, Font::fontTypeName [%s] Shared::Platform::charSet = %d, Font::fontIsMultibyte = %d, fontIsRightToLeft = %d\n",__FILE__,__FUNCTION__,__LINE__,Shared::Graphics::Font::charCount,Shared::Graphics::Font::fontTypeName.c_str(),Shared::Platform::PlatformContextGl::charSet,Shared::Graphics::Font::fontIsMultibyte, Shared::Graphics::Font::fontIsRightToLeft);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] Font::charCount = %d, Font::fontTypeName [%s] Shared::Platform::PlatformContextGl::charSet = %d, Font::fontIsMultibyte = %d, fontIsRightToLeft = %d\n",__FILE__,__FUNCTION__,__LINE__,Shared::Graphics::Font::charCount,Shared::Graphics::Font::fontTypeName.c_str(),Shared::Platform::PlatformContextGl::charSet,Shared::Graphics::Font::fontIsMultibyte, Shared::Graphics::Font::fontIsRightToLeft);
|
||||||
|
|
||||||
NetworkInterface::setDisplayMessageFunction(ExceptionHandler::DisplayMessage);
|
NetworkInterface::setDisplayMessageFunction(ExceptionHandler::DisplayMessage);
|
||||||
MenuStateMasterserver::setDisplayMessageFunction(ExceptionHandler::DisplayMessage);
|
MenuStateMasterserver::setDisplayMessageFunction(ExceptionHandler::DisplayMessage);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user