From ed112a5484f6cf75fca6acff85e42740de5c2c65 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Tue, 10 Jan 2017 10:52:51 +0300 Subject: [PATCH] Minor bug fixing --- SalmonEngineAndroid/.gitignore | 1 + SalmonEngineAndroid/app/src/main/AndroidManifest.xml | 11 ----------- src/Utils/Console/Console.cpp | 5 +++-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/SalmonEngineAndroid/.gitignore b/SalmonEngineAndroid/.gitignore index a4c7838..ac58bed 100755 --- a/SalmonEngineAndroid/.gitignore +++ b/SalmonEngineAndroid/.gitignore @@ -1,6 +1,7 @@ *.iml .gradle /local.properties +.idea /.idea/workspace.xml /.idea/libraries .DS_Store diff --git a/SalmonEngineAndroid/app/src/main/AndroidManifest.xml b/SalmonEngineAndroid/app/src/main/AndroidManifest.xml index 0b85990..c49213e 100755 --- a/SalmonEngineAndroid/app/src/main/AndroidManifest.xml +++ b/SalmonEngineAndroid/app/src/main/AndroidManifest.xml @@ -1,17 +1,6 @@ - - - diff --git a/src/Utils/Console/Console.cpp b/src/Utils/Console/Console.cpp index a7e4411..e144df8 100755 --- a/src/Utils/Console/Console.cpp +++ b/src/Utils/Console/Console.cpp @@ -71,6 +71,7 @@ void TSimpleConsole::Draw() void TSimpleConsole::CutHistory() { + /* cardinal i = 0; cardinal pos = std::string::npos; @@ -90,7 +91,7 @@ void TSimpleConsole::CutHistory() if (pos != std::string::npos) { History = History.substr(pos); - } + }*/ } std::string TSimpleConsole::GetHistory() @@ -234,7 +235,7 @@ TJavaConsole& TJavaConsole::operator<<(const std::string& s) CutHistory(); - __android_log_print(ANDROID_LOG_VERBOSE, APPNAME, "%s", string_with_time_mark.c_str()); + //__android_log_print(ANDROID_LOG_VERBOSE, APPNAME, "%s", string_with_time_mark.c_str());