From 83e59b369e8e979a0e93065b61be008a1b691ba5 Mon Sep 17 00:00:00 2001 From: neitsa Date: Sat, 25 May 2019 15:49:52 +0200 Subject: [PATCH 1/2] Fix OS version on Windows; Move 'bitness' next to game version. --- src/debug.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/debug.cpp b/src/debug.cpp index 04a744f51b51c..040103d8f1450 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -1002,7 +1002,7 @@ static std::string windows_version() &buffer_size ) == ERROR_SUCCESS && value_type == REG_SZ; if( success ) { output.append( " " ); - output.append( std::string( byte_buffer.begin(), byte_buffer.end() ) ); + output.append( std::string( reinterpret_cast( byte_buffer.data() ) ) ); } } @@ -1109,9 +1109,9 @@ std::string game_info::game_report() } std::stringstream report; report << - "- OS: " << operating_system() << " [" << bitness() << "]\n" << + "- OS: " << operating_system() << "\n" << " - OS Version: " << os_version << "\n" << - "- Game Version: " << game_version() << "\n" << + "- Game Version: " << game_version() << " [" << bitness() << "]\n" << "- Graphics Version: " << graphics_version() << "\n" << "- Mods loaded: [\n " << mods_loaded() << "\n]\n"; From 03fbbc2d9953d96060db720a2cee0f84ced88114 Mon Sep 17 00:00:00 2001 From: neitsa Date: Sat, 25 May 2019 16:08:59 +0200 Subject: [PATCH 2/2] Fix for Android. --- src/debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/debug.cpp b/src/debug.cpp index 040103d8f1450..3cdaf95f3244c 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -879,7 +879,7 @@ static std::string android_version() // failed to get the property value = ""; } else { - value = std::string( buffer.begin(), buffer.end() ); + value = std::string( buffer.data() ); } output.append( string_format( "%s: %s; ", entry.second, value ) ); }